Remove database.yml and add to .gitignore: use your own local version
Merge branch 'master' of github.com:edwallitt/digitaldoc