updated and changed various points
Merge branch 'master' of https://github.com/voidplus/grunt-init-boilerplate