diff --git a/.gitignore b/.gitignore
index 8b309cc03cd76ba376e308fc3f422baca30719ee..91e987e1c40dcf1ecb19d5dcf77be8b980607f11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,6 @@
 db/*.sqlite3
 log/*.log
 tmp/**/*
+Gemfile.lock
 gpg/diaspora-development/*.gpg
 gpg/diaspora-production/*.gpg
diff --git a/Gemfile b/Gemfile
index 4f2c736a1a6ad3f2fe9ffc00dd44f13c1117a2b3..7be06ae84c58051da9dabe6206227561c9a91c29 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 source 'http://gemcutter.org'
 
-gem 'rails', '3.0.0.beta4'
+gem 'rails', :git =>'http://github.com/rails/rails.git'
 gem 'bundler'
 gem 'mongo_mapper', :git => "http://github.com/BadMinus/mongomapper.git"
 gem 'devise', :git => "http://github.com/BadMinus/devise.git"
diff --git a/config/environments/development.rb b/config/environments/development.rb
index d03bf7d3acfbac1582e5b6cc2933e1b8172ddbed..12446d661757ffe77077fdc00a292576e8b736db 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -16,6 +16,6 @@ Diaspora::Application.configure do
 
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
-
+  config.active_support.deprecation = :log
   #config.threadsafe!
 end
diff --git a/lib/common.rb b/lib/common.rb
index a049b561fbc1f584fd7a47761b1f0eb4fb2ede53..13c87ae6229f5896763ff69a9912fbce0337f970 100644
--- a/lib/common.rb
+++ b/lib/common.rb
@@ -47,6 +47,7 @@ module Diaspora
     def self.included(klass)
       klass.class_eval do
         include ROXML
+        require 'message_handler'
         @@queue = MessageHandler.new
 
         def notify_people