Merge branch 'master' into patch-2

Author: kenyonj

Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     ast (2.4.0)
     fastimage (2.1.5)
-    jaro_winkler (1.5.2)
+    jaro_winkler (1.5.3)
     minitest (5.11.3)
     parallel (1.17.0)
     parser (2.6.3.0)
@@ -17,8 +17,8 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.3.0)
-      rubocop (>= 0.68.0)
+    rubocop-performance (1.4.0)
+      rubocop (>= 0.71.0)
     ruby-progressbar (1.10.1)
     safe_yaml (1.0.5)
     unicode-display_width (1.6.0)