diff --git a/Gemfile b/Gemfile
index d97c3bf57..9acf76ca2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,9 +3,9 @@ source 'http://rubygems.org'
 gem 'rails', '3.0.3'
 
 gem 'bundler', '>= 1.0.0'
-gem "chef", :require => false
+gem 'chef', :require => false
 
-gem "nokogiri", "1.4.3.1"
+gem 'nokogiri', '1.4.3.1'
 
 #Security
 gem 'devise', '1.1.3'
@@ -31,12 +31,7 @@ gem 'addressable', :require => 'addressable/uri'
 gem 'json'
 gem 'http_accept_language', :git => 'git://github.com/iain/http_accept_language.git'
 
-#Standards
-gem 'pubsubhubbub'
-
-#EventMachine
-gem 'em-http-request',:ref => 'bf62d67fc72d6e701be5',  :git => 'git://github.com/igrigorik/em-http-request.git', :require => 'em-http'
-gem 'thin'
+gem 'thin', :require => false
 
 #Websocket
 gem 'em-websocket', :git => 'git://github.com/igrigorik/em-websocket'
@@ -49,16 +44,16 @@ gem 'fastercsv', :require => false
 gem 'jammit'
 gem 'rest-client'
 #Backups
-gem "cloudfiles", :require => false
+gem 'cloudfiles', :require => false
 
 #Queue
 gem 'resque'
-gem 'SystemTimer' unless RUBY_VERSION.include? "1.9"
+gem 'SystemTimer' unless RUBY_VERSION.include? '1.9'
 
 group :test, :development do
   gem 'factory_girl_rails'
-  gem 'ruby-debug19' if RUBY_VERSION.include? "1.9"
-  gem 'ruby-debug' if RUBY_VERSION.include? "1.8"
+  gem 'ruby-debug19' if RUBY_VERSION.include? '1.9'
+  gem 'ruby-debug' if RUBY_VERSION.include? '1.8'
   gem 'launchy'
 end
 
@@ -71,10 +66,6 @@ group :test do
   gem 'database_cleaner', '0.5.2'
   gem 'webmock', :require => false
   gem 'jasmine', :path => 'vendor/gems/jasmine', :require => false
-  gem 'mongrel', :require => false if RUBY_VERSION.include? "1.8"
+  gem 'mongrel', :require => false if RUBY_VERSION.include? '1.8'
   gem 'rspec-instafail', :require => false
 end
-
-group :deployment do
-  #gem 'sprinkle', :git => 'git://github.com/rsofaer/sprinkle.git'
-end
diff --git a/Gemfile.lock b/Gemfile.lock
index 10a37ef62..1f1ba635a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -19,15 +19,6 @@ GIT
   specs:
     http_accept_language (1.0.1)
 
-GIT
-  remote: git://github.com/igrigorik/em-http-request.git
-  revision: bf62d67fc72d6e701be5037e239dd470194b8e45
-  ref: bf62d67fc72d6e701be5
-  specs:
-    em-http-request (0.2.13)
-      addressable (>= 2.0.0)
-      eventmachine (>= 0.12.9)
-
 GIT
   remote: git://github.com/igrigorik/em-websocket
   revision: e278f5a1c4db60be7485859520a069e08bfe1247
@@ -275,9 +266,6 @@ GEM
     plucky (0.3.6)
       mongo (~> 1.1)
     polyglot (0.3.1)
-    pubsubhubbub (0.1.1)
-      em-http-request (>= 0.1.5)
-      eventmachine (>= 0.12.9)
     pyu-ruby-sasl (0.0.3.2)
     rack (1.2.1)
     rack-mount (0.6.13)
@@ -390,7 +378,6 @@ DEPENDENCIES
   devise (= 1.1.3)
   devise-mongo_mapper!
   devise_invitable (= 0.3.5)
-  em-http-request!
   em-websocket!
   factory_girl_rails
   fastercsv
@@ -406,7 +393,6 @@ DEPENDENCIES
   mongrel
   nokogiri (= 1.4.3.1)
   omniauth (= 0.1.6)
-  pubsubhubbub
   rails (= 3.0.3)
   resque
   rest-client