Update readme
Make database.yml general
Fix merge conflicts