Use environment vars for db credentials
Merge branch 'master' of github.com:edwlook/pickup