updated rails for kicks, run bundle install, and run gem install bundler --pre rspec-rails --pre too

.gitignore

@@ -6,5 +6,6 @@
 db/*.sqlite3
 log/*.log
 tmp/**/*
+Gemfile.lock
 gpg/diaspora-development/*.gpg
 gpg/diaspora-production/*.gpg

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"

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

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