can now specify patsy as a list if you prefer
Merge branch 'master' of https://github.com/synthicity/urbansim

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