updated grunt options
Merge https://github.com/jason-hoppedupdesigns/new-project-framework

Conflicts:
	git-commands.txt
Merge https://github.com/jason-hoppedupdesigns/new-project-framework