diff --git a/Gemfile.lock b/Gemfile.lock
index 123ff646..e3661cce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,42 +1,11 @@
 GIT
-  remote: git://github.com/eventmachine/eventmachine.git
-  revision: 45db519d1f24a965c0da3751f0850ff3c099d5a2
+  remote: https://github.com/iain/http_accept_language.git
+  revision: 74a6a244afa069154d08df0f5df373a6c7fc4fe2
   specs:
-    eventmachine (1.0.7)
+    http_accept_language (2.1.1)
 
 GIT
-  remote: git://github.com/iain/http_accept_language.git
-  revision: 38890b400e3c7bdd348a386f4460632eb42fc7a8
-  specs:
-    http_accept_language (2.0.5)
-
-GIT
-  remote: git://github.com/igrigorik/em-http-request.git
-  revision: 2b894a29f112b451195d5be2e72176288c8ded6e
-  specs:
-    em-http-request (1.1.2)
-      addressable (>= 2.3.4)
-      cookiejar (<= 0.3.0)
-      em-socksify (>= 0.3)
-      eventmachine (>= 1.0.3)
-      http_parser.rb (>= 0.6.0)
-
-GIT
-  remote: git://github.com/igrigorik/em-mysqlplus.git
-  revision: 11d6e1123654b948c1d0a8c9d9077e82420b2846
-  specs:
-    em-mysqlplus (0.1.5)
-      eventmachine (>= 0.12.9)
-
-GIT
-  remote: git://github.com/igrigorik/em-synchrony.git
-  revision: ab7db1c1e7b67a132d742ee640224055c97bba6e
-  specs:
-    em-synchrony (1.0.4)
-      eventmachine (>= 1.0.0.beta.1)
-
-GIT
-  remote: git://github.com/matchu/flex.git
+  remote: https://github.com/matchu/flex.git
   revision: 6d7e3fd6e2845ae978545be67b912323888d1ebb
   specs:
     flex (0.4.1)
@@ -45,7 +14,7 @@ GIT
       prompter (~> 0.1.5)
 
 GIT
-  remote: git://github.com/matchu/globalize3.git
+  remote: https://github.com/matchu/globalize3.git
   revision: e23277864270131bbee29033f8a3abfb74ffe1f8
   specs:
     globalize3 (0.3.0)
@@ -54,20 +23,14 @@ GIT
       paper_trail (~> 2)
 
 GIT
-  remote: git://github.com/matchu/neopets.git
+  remote: https://github.com/matchu/neopets.git
   revision: 5d13a720b616ba57fbbd54541f3e5daf02b3fedc
   specs:
     neopets (0.2.0)
       nokogiri (~> 1.5.2)
 
 GIT
-  remote: git://github.com/oldmoe/mysqlplus.git
-  revision: 354837499c0c83ddc7dcc0decff2056e36ed4403
-  specs:
-    mysqlplus (0.1.3)
-
-GIT
-  remote: git://github.com/rubyamf/rocketamf.git
+  remote: https://github.com/rubyamf/rocketamf.git
   revision: 796f591d002b5cf47df436dbcbd6f2ab00e869ed
   specs:
     RocketAMF (1.0.0)
@@ -137,7 +100,6 @@ GEM
       sass (~> 3.2.19)
     compass-rails (1.0.3)
       compass (>= 0.12.2, < 0.14)
-    cookiejar (0.3.0)
     devise (2.2.8)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
@@ -149,8 +111,6 @@ GEM
     dotenv-rails (2.0.1)
       dotenv (= 2.0.1)
     dye (0.1.4)
-    em-socksify (0.3.0)
-      eventmachine (>= 1.0.0.beta.4)
     erubis (2.7.0)
     excon (0.45.4)
     execjs (2.5.2)
@@ -175,7 +135,6 @@ GEM
       tilt
     highline (1.7.2)
     hike (1.2.3)
-    http_parser.rb (0.6.0)
     i18n (0.7.0)
     journey (1.0.4)
     json (1.8.3)
@@ -208,7 +167,7 @@ GEM
     paper_trail (2.7.2)
       activerecord (~> 3.0)
       railties (~> 3.0)
-    parallel (0.5.21)
+    parallel (1.13.0)
     passenger_monit (0.1.1)
     patron (0.4.20)
     polyglot (0.3.5)
@@ -221,7 +180,6 @@ GEM
       rack
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-fiber_pool (0.9.3)
     rack-protection (1.5.3)
       rack
     rack-ssl (1.3.4)
@@ -326,7 +284,7 @@ GEM
       activesupport (>= 2.3.4)
       chronic (~> 0.6.3)
     will_paginate (3.0.7)
-    yard (0.8.7.6)
+    yard (0.9.34)
 
 PLATFORMS
   ruby
@@ -342,10 +300,6 @@ DEPENDENCIES
   devise (~> 2.2.3)
   dotenv-deployment
   dotenv-rails
-  em-http-request!
-  em-mysqlplus!
-  em-synchrony!
-  eventmachine!
   factory_girl_rails (~> 1.0)
   flex!
   fog (~> 1.8.0)
@@ -358,16 +312,14 @@ DEPENDENCIES
   mini_magick (~> 3.4)
   msgpack (~> 0.5.3)
   mysql2 (>= 0.3.11)
-  mysqlplus!
   neopets (~> 0.2.0)!
   newrelic_rpm
   nokogiri (~> 1.5.2)
   openneo-auth-signatory (~> 0.1.0)
-  parallel (~> 0.5.17)
+  parallel (~> 1.13.0)
   passenger_monit (~> 0.1.1)
   patron (~> 0.4.18)
   rack-attack (~> 2.2.0)
-  rack-fiber_pool
   rails (= 3.2.18)
   rails-i18n
   rdiscount (~> 1.6.5)
@@ -388,4 +340,4 @@ DEPENDENCIES
   will_paginate (~> 3.0.pre2)
 
 BUNDLED WITH
-   1.10.5
+   1.17.3
diff --git a/vendor/cache/cookiejar-0.3.0.gem b/vendor/cache/cookiejar-0.3.0.gem
deleted file mode 100644
index 9dce60b7..00000000
Binary files a/vendor/cache/cookiejar-0.3.0.gem and /dev/null differ
diff --git a/vendor/cache/em-socksify-0.3.0.gem b/vendor/cache/em-socksify-0.3.0.gem
deleted file mode 100644
index 9117724d..00000000
Binary files a/vendor/cache/em-socksify-0.3.0.gem and /dev/null differ
diff --git a/vendor/cache/http_parser.rb-0.6.0.gem b/vendor/cache/http_parser.rb-0.6.0.gem
deleted file mode 100644
index 3d3d508f..00000000
Binary files a/vendor/cache/http_parser.rb-0.6.0.gem and /dev/null differ
diff --git a/vendor/cache/parallel-0.5.21.gem b/vendor/cache/parallel-0.5.21.gem
deleted file mode 100644
index 6f1d74cd..00000000
Binary files a/vendor/cache/parallel-0.5.21.gem and /dev/null differ
diff --git a/vendor/cache/parallel-1.13.0.gem b/vendor/cache/parallel-1.13.0.gem
new file mode 100644
index 00000000..c796ed00
Binary files /dev/null and b/vendor/cache/parallel-1.13.0.gem differ
diff --git a/vendor/cache/rack-fiber_pool-0.9.3.gem b/vendor/cache/rack-fiber_pool-0.9.3.gem
deleted file mode 100644
index 73c479c7..00000000
Binary files a/vendor/cache/rack-fiber_pool-0.9.3.gem and /dev/null differ
diff --git a/vendor/cache/yard-0.8.7.6.gem b/vendor/cache/yard-0.8.7.6.gem
deleted file mode 100644
index 98d492de..00000000
Binary files a/vendor/cache/yard-0.8.7.6.gem and /dev/null differ
diff --git a/vendor/cache/yard-0.9.34.gem b/vendor/cache/yard-0.9.34.gem
new file mode 100644
index 00000000..6946b641
Binary files /dev/null and b/vendor/cache/yard-0.9.34.gem differ