Add database.yml to gitignore
Merge branch 'master' into wip