merging master in.... now I am going to go back to 187

config/environments/development.rb

@@ -16,8 +16,6 @@ Diaspora::Application.configure do
 
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
-  
-  
-  #oiy
+
   #config.threadsafe!
 end