Add info about grunt-build-control to Colophon.
Fix a merge conflict. Ugh.

Conflicts:
	app/colophon.html