JH's 7-11 changes
Merge branch 'master' of github.com:OpenTransitTools/view

Conflicts:
	ott/view/templates/desktop/stop_select_form.html
fix up the merge