Merge pull request #141 from jasnow/master

Upgraded 4+ gems by rebuilding Gemfile.lock file

Gemfile.lock

@@ -127,7 +127,6 @@ GEM
       guard (>= 1.1.0)
     haml (4.0.5)
       tilt
-    hashr (0.0.22)
     highline (1.6.21)
     hike (1.2.3)
     http_parser.rb (0.6.0)
@@ -237,14 +236,13 @@ GEM
       sexp_processor (~> 4.0)
     ruby_parser (3.5.0)
       sexp_processor (~> 4.1)
-    safe_yaml (0.9.7)
     sass (3.3.10)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
     sexp_processor (4.4.3)
-    simplecov (0.8.2)
+    simplecov (0.9.0)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
@@ -259,7 +257,7 @@ GEM
     slim (2.0.3)
       temple (~> 0.6.6)
       tilt (>= 1.3.3, < 2.1)
-    slop (3.5.0)
+    slop (3.6.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -278,15 +276,14 @@ GEM
     thor (0.19.1)
     tilt (1.4.1)
     timers (1.1.0)
-    travis-lint (1.8.0)
-      hashr (~> 0.0.22)
-      safe_yaml (~> 0.9.0)
+    travis-lint (2.0.0)
+      json
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     trollop (2.0)
     tzinfo (0.3.40)
-    uglifier (2.5.1)
+    uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unicorn (4.8.3)