Updates for Heroku

Brings `master` up to date.