Make log formats pluggable, and remove cruft/improve lint score

This has been tested in Vagrant but it lacks specs - sorry.

Please see comments on individual commits for more details.