Made the Makefile not be so literal about the cp cluster.html -> index.html command it was running.
Fixing js docs in reql doc
Fixing divergence between rethinkdb-www
Merge branch 'next' into sam_makefilenoise

Conflicts:
	src/Makefile
Merge branch 'next' into sam_177