Merge branch 'master' of https://github.com/sgmeyer/generator-crafty

Conflicts:
	app/templates/_Gruntfile.js
	app/templates/_index.html
Cleaning up merge
Merge branch 'master' of https://github.com/sgmeyer/generator-crafty