diff --git a/Gemfile b/Gemfile
index 530573c68..f6a5cbb1a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'rails', '3.0.0.beta4'
 gem 'mongrel'
 gem 'thin'
-gem 'em-http-request', :require => "em-http"
+gem 'em-http-request', :require => "em-http", :git => "git://github.com/igrigorik/em-http-request.git"
 gem 'addressable', :require => "addressable/uri"
 gem "mongoid", :git => "git://github.com/durran/mongoid.git"
 gem "bson_ext", "1.0.1"
diff --git a/config/environments/development.rb b/config/environments/development.rb
index dfb1f2e18..45d756166 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -16,4 +16,5 @@ Diaspora::Application.configure do
 
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
+  config.threadsafe!
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index e47cce459..312da846d 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -43,4 +43,5 @@ Diaspora::Application.configure do
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation can not be found)
   config.i18n.fallbacks = true
+  config.threadsafe!
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 1a9134407..69a870933 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -29,18 +29,5 @@ Diaspora::Application.configure do
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
   # config.active_record.schema_format = :sql
-  #
-  #
-  #
-
-
-
-begin
- require 'database_cleaner'
- DatabaseCleaner.strategy = :truncation
- DatabaseCleaner.orm = "mongoid"
-rescue LoadError => ignore_if_database_cleaner_not_present
- puts "Error on cleaner"
-end
   
 end