Merge branch 'master' into kenyonj-patch-1

Author: kenyonj

Gemfile.lock

@@ -82,7 +82,7 @@ GEM
       octokit (~> 4.0)
       public_suffix (~> 2.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.9.1)
+    html-pipeline (2.9.2)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     html-proofer (3.9.3)