Making changes so I can deploy on Heroku.

Will remove these changes once I figure out how to keep the actual code
and the Heroku deployment dependecies/code changes separate.