Implement option to disable shell escaping.

re: #788
Format tweak
Merge branch 'master' into 864-int
Changelog re #844, #864
Hide moar during tests n00b