Change stuff for Heroku / Postgres.
Merge because I made a mess.
Fix app build.