more grunt stuff and some changes from runing jslint
Merge branch 'master' of https://github.com/walkerart/infolounge_walls

Conflicts:
	index.html