Merge branch 'master' of https://github.com/cmgerber/CensusMapper

Conflicts:
	CensusMapperFlask/CensusMapperFlask/templates/user_control.html