map update
Merge branch 'master' of https://github.com/stephjsu/get-your-ride

Conflicts:
	get_your_ride/views.pyc