formatting
Merge branch 'master' of github.com:kmulvey/bootstrap-builder