small changes to merge formatting
Merge branch 'master' of https://github.com/synthicity/urbansim

Conflicts:
	urbansim/urbansim/templates/locationchoicemodel.py.template