Updates and cleanup
Merge Dominion/master

Conflicts:
	README.md