Instead of having to build it manually in a Grunt/Makefile step.
Clean up the Makefile a bit as well.

Conflicts:
	Makefile