<heroku> - Added fixes for running on heroku and travis.