update .gitignore
update grunt config
Conflicts:
	Gruntfile.js
	index.html