Merge branch 'master' of github.com:diaspora/diaspora

app/views/posts/_debug.haml

 #debug_info
   %h5 DEBUG INFO
-  #debug_more{ :style => "display:none;" }
+  #debug_more
     %ul
       %li
         %b params

config/routes.rb

-Diaspora::Application.routes.draw do |map|
+Diaspora::Application.routes.draw do
   resources :people
   resources :users, :only => [:edit, :show, :update]
   resources :status_messages