Merge branch 'master' into new-topic/bosque-lang

Author: kenyonj

Gemfile.lock

@@ -6,7 +6,7 @@ GEM
     jaro_winkler (1.5.2)
     minitest (5.11.3)
     parallel (1.17.0)
-    parser (2.6.2.1)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
     psych (3.1.0)
     rainbow (3.0.0)