Fix deployment issues

These changes should fix your deployment issues. Merge them in, do a `git pull origin master` and then try to redeploy to Heroku.