Modify database config to use PG default host and user account
Merge branch 'master' into update-users to pull in database config update