Merge pull request #224 from jasnow/master

Upgraded Rails to 4.2.6 plus 2 more gems

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 #don't upgrade
-gem 'rails', '4.2.5.2'
+gem 'rails', '4.2.6'
 
 ruby '2.3.0'
 

Gemfile.lock

@@ -1,36 +1,36 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.5.2)
+    actionmailer (4.2.6)
-      actionpack (= 4.2.5.2)
+      actionpack (= 4.2.6)
-      actionview (= 4.2.5.2)
+      actionview (= 4.2.6)
-      activejob (= 4.2.5.2)
+      activejob (= 4.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5.2)
+    actionpack (4.2.6)
-      actionview (= 4.2.5.2)
+      actionview (= 4.2.6)
-      activesupport (= 4.2.5.2)
+      activesupport (= 4.2.6)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5.2)
+    actionview (4.2.6)
-      activesupport (= 4.2.5.2)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.5.2)
+    activejob (4.2.6)
-      activesupport (= 4.2.5.2)
+      activesupport (= 4.2.6)
       globalid (>= 0.3.0)
-    activemodel (4.2.5.2)
+    activemodel (4.2.6)
-      activesupport (= 4.2.5.2)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activerecord (4.2.5.2)
+    activerecord (4.2.6)
-      activemodel (= 4.2.5.2)
+      activemodel (= 4.2.6)
-      activesupport (= 4.2.5.2)
+      activesupport (= 4.2.6)
       arel (~> 6.0)
-    activesupport (4.2.5.2)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -42,7 +42,7 @@ GEM
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bcrypt (3.1.10)
+    bcrypt (3.1.11)
     better_errors (2.1.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -210,16 +210,16 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.5.2)
+    rails (4.2.6)
-      actionmailer (= 4.2.5.2)
+      actionmailer (= 4.2.6)
-      actionpack (= 4.2.5.2)
+      actionpack (= 4.2.6)
-      actionview (= 4.2.5.2)
+      actionview (= 4.2.6)
-      activejob (= 4.2.5.2)
+      activejob (= 4.2.6)
-      activemodel (= 4.2.5.2)
+      activemodel (= 4.2.6)
-      activerecord (= 4.2.5.2)
+      activerecord (= 4.2.6)
-      activesupport (= 4.2.5.2)
+      activesupport (= 4.2.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5.2)
+      railties (= 4.2.6)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -229,9 +229,9 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.5.2)
+    railties (4.2.6)
-      actionpack (= 4.2.5.2)
+      actionpack (= 4.2.6)
-      activesupport (= 4.2.5.2)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.16.0)
@@ -290,7 +290,7 @@ GEM
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.3)
+    sprockets-rails (3.0.4)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -360,7 +360,7 @@ DEPENDENCIES
   pry
   pry-rails
   rack-livereload
-  rails (= 4.2.5.2)
+  rails (= 4.2.6)
   rb-fsevent
   rspec-rails (= 2.14.2)
   sass-rails