Continued PostgreSQL and Heroku Migration

Missed some changes in the last commit, whoops.