working version of makemodel
Merge branch 'master' of https://github.com/morgante/travelwatch

Conflicts:
	ml/make_model.py