Made the Makefile not be so literal about the cp cluster.html -> index.html command it was running.
Merge branch 'next' into sam_makefilenoise

Conflicts:
	src/Makefile