 -    activesupport (4.2.8)
 +    activesupport (4.2.2)
        i18n (~> 0.7)
++      json (~> 1.7, >= 1.7.7)
        minitest (~> 5.1)
        thread_safe (~> 0.3, >= 0.3.4)
-@@ -43,7 +43,7 @@ GEM
+       tzinfo (~> 1.1)
+@@ -43,7 +44,7 @@ GEM
      annotate (2.6.5)
        activerecord (>= 2.3.0)
        rake (>= 0.8.7)

     tilt (1.4.1)
     timecop (0.7.4)
-    treetop (1.6.5)
-      polyglot (~> 0.3)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
     typhoeus (1.0.2)
       ethon (>= 0.9.0)
     tzinfo (1.2.2)
@@ -419,11 +419,11 @@ DEPENDENCIES
   poltergeist (~> 1.15.0)
   pry-rails
   public_activity
-  puma (~> 3.7.0)
+  puma (~> 2.16.0)
   pundit
   quiet_assets
   rack-mini-profiler
-  rails (~> 4.2.8)
+  rails (~> 4.2.2)
   rails-erd
   rails_stdout_logging (~> 0.0.5)
   redcarpet

     ast (2.3.0)
     autoprefixer-rails (5.2.0.1)
       execjs
@@ -127,7 +128,7 @@ GEM
       octokit (~> 2.0.0)
       yajl-ruby
     gli (2.8.1)
