Merge pull request #213 from jasnow/master

Upgraded ruby to 2.2.4 plus 5 gems. Thanks!

.ruby-version

@@ -1 +1 @@
-2.2.3
+2.2.4

.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - "2.2.3"
+  - "2.2.4"
 before_script: rake db:setup
 before_script: bundle exec rake db:setup
 cache: bundler

Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 #don't upgrade
 gem 'rails', '4.2.5'
 
-ruby '2.2.3'
+ruby '2.2.4'
 
 # Bundle edge Rails instead:
 # gem 'rails', github: 'rails/rails'

Gemfile.lock

@@ -75,9 +75,9 @@ GEM
       ffi (~> 1.0, >= 1.0.11)
     cliver (0.3.2)
     coderay (1.1.0)
-    coffee-rails (4.1.0)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0, < 5.1.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -99,7 +99,7 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
-    eventmachine (1.0.5)
+    eventmachine (1.0.8)
     execjs (2.6.0)
     fastercsv (1.5.5)
     ffi (1.9.10)
@@ -165,9 +165,9 @@ GEM
     lumberjack (1.0.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mailcatcher (0.6.1)
+    mailcatcher (0.6.2)
       activesupport (>= 4.0.0, < 5)
-      eventmachine (~> 1.0.0, <= 1.0.5)
+      eventmachine (= 1.0.8)
       mail (~> 2.3)
       sinatra (~> 1.2)
       skinny (~> 0.2.3)
@@ -287,10 +287,10 @@ GEM
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
+    sprockets-rails (3.0.0)
-      actionpack (>= 3.0)
+      actionpack (>= 4.0)
-      activesupport (>= 3.0)
+      activesupport (>= 4.0)
-      sprockets (>= 2.8, < 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.3.11)
     temple (0.7.6)
     terminal-table (1.5.2)
@@ -371,4 +371,4 @@ DEPENDENCIES
   unicorn
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

config/initializers/assets.rb

@@ -0,0 +1 @@
+Rails.application.config.assets.precompile += %w( validation.js jquery.dataTables.js )