Merge pull request #36 from jontewks/production

Fixed bug so that city shows current city rather than hometown. Removed ...
Merge branch 'production' of https://github.com/janaspage/moviebuddy into janaspage-production

Conflicts:
	app/views/outings.html
	config/db_config.js
Merge branch 'production' of https://github.com/MovieBuddy/moviebuddy into production

Conflicts:
	app/views/outings.html