Switch to environment variables for database connection
Merge branch 'master' of https://github.com/CooperAtive/goalkeeper

Merging with master.