Rubocop autofixes

Fix middleman#2019

Change how config options are passed to Thor. Removes new Thor warnin…

…gs from middleman#2017

Prep

Fix up tests

Fix japanese characters encoding in URLs

prep

Fix ordering in tests

Bump dep

Really fix middleman#1864