Updates to allow for easy deploy to heroku