Revert "Revert "Some Heroku stuff""

This reverts commit 27033aba1df1f6ed2c72af0255ce099e4fd661a4.