Getting ready for Heroku. Plus other changes.