Merge pull request maxdemarzi#121 from kfreytag/develop

Updated to remove duplicates that caused remote cacheable gem to be incl...

Gemfile.lock

@@ -11,22 +11,22 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.2)
-      activesupport (= 4.0.2)
+    activemodel (4.0.3)
+      activesupport (= 4.0.3)
       builder (~> 3.1.0)
-    activesupport (4.0.2)
+    activesupport (4.0.3)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    atomic (1.1.14)
+    atomic (1.1.15)
     builder (3.1.4)
     ci_reporter (1.9.1)
       builder (>= 2.1.2)
     coderay (1.1.0)
     diff-lcs (1.2.5)
-    factory_girl (4.3.0)
+    factory_girl (4.4.0)
       activesupport (>= 3.0.0)
     ffi (1.9.3)
     formatador (0.2.4)
@@ -60,15 +60,15 @@ GEM
       rubyzip (~> 0.9.7)
     oj (2.1.7)
     os (0.9.6)
-    pry (0.9.12.4)
+    pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
     rake (10.1.1)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.3)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
+    rb-kqueue (0.2.2)
       ffi (>= 0.5.0)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
@@ -81,8 +81,8 @@ GEM
     rubyzip (0.9.9)
     slop (3.4.7)
     thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+    thread_safe (0.2.0)
+      atomic (>= 1.1.7, < 2)
     timecop (0.7.1)
     tzinfo (0.3.38)