Merge branch 'master' of github.com:cdebotton/grunt-boilerplate

Conflicts:
	README.md
Merge branch 'master' of github.com:cdebotton/grunt-boilerplate