Trying to fix some formatting deficiencies.
Workaround for https://github.com/iElectric/mr.bob/issues/70
Merge branch 'develop'