cleaning up more of the grunt-init-basic boilerplate
Merge branch 'gh-pages'