refactored options
Merge branch 'master' into Map-Overhaul

Conflicts:
	src/amidst/Amidst.java