Made some changes needed for deployment to Heroku