formatting
Merge branch 'master' of https://github.com/jonmilner/generator-boilerplate