Added lots of changes from Heroku.
Merge branch 'master' of https://github.com/ohack/maraudersmap-server

Conflicts:
	app.py
	requirements.txt