Merge branch 'master' into arl-code-json-updates

Author: Jordan Kasper

Gemfile.lock

@@ -23,7 +23,7 @@ GEM
       http_parser.rb (~> 0.6.0)
     ethon (0.11.0)
       ffi (>= 1.3.0)
-    eventmachine (1.2.6)
+    eventmachine (1.2.7)
     ffi (1.9.23)
     forwardable-extended (2.6.0)
     html-proofer (3.8.0)