General hardening. Updated world.
Merging Chris' work from his office into the latest master branch.
(Chris' work was done off of the master branch)

Conflicts:
	cities/building.py
	cities/inn.py
	cities/shop.py
	commands/describe_command.py
	game_loader.py
	player.py
	space.py