Initial work on grunt integration
Merge branch 'master' of https://github.com/ttaylorr/mc

Conflicts:
	.travis.yml