Use Postgres on Heroku.
Use Postgres on Heroku.
Combine latest changes on diaspora/diaspora with the fork

Merge branch 'master' of heroku.com:diasporatubbo