Merges rapid7#1706, removing gemcache per brandont

This has been put off for a long while.

Author: todb

.gitignore

@@ -1,3 +1,4 @@
+.bundle
 # Rubymine project directory
 .idea
 # RVM control file

Gemfile.lock

@@ -27,39 +27,39 @@ GEM
     builder (3.0.4)
     coderay (1.0.9)
     database_cleaner (0.9.1)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.2)
     factory_girl (4.2.0)
       activesupport (>= 3.0.0)
     i18n (0.6.1)
     json (1.7.7)
     method_source (0.8.1)
-    msgpack (0.5.2)
+    msgpack (0.5.4)
     multi_json (1.0.4)
-    nokogiri (1.5.6)
+    nokogiri (1.5.9)
     pcaprub (0.11.3)
-    pg (0.14.1)
+    pg (0.15.0)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rake (10.0.2)
+    rake (10.0.4)
     redcarpet (2.2.2)
     robots (0.10.1)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.1)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
     simplecov (0.5.4)
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     slop (3.4.4)
     tzinfo (0.3.37)
-    yard (0.8.3)
+    yard (0.8.5.2)
 
 PLATFORMS
   ruby