variable changes
Merge branch 'master' of https://github.com/beaucharman/grunt-project-kickstarter

Conflicts:
	Gruntfile.js
	package.json