Re-revert some things back to the working state.
Fix town plots
Merge remote-tracking branch 'origin/master'

Conflicts:
	TheArtifact.iml
Reverts back to 1.7.2