Applying portions of https://github.com/heroku/databasedotcom/pull/63 to support multiple users and orgs.