Several minor changes. Added Heroku support