Correct repo locations.
Merge branch 'master' into cake3

Conflicts:
	README.md