Made Simulated Annealing Hella Fast
Merge remote-tracking branch 'origin/master'

Conflicts:
	updated/city.pyc
	updated/city_util.pyc
	updated/local_search.pyc
	updated/objectives.pyc
	updated/structure.pyc