Update README.md
added server blocks
Merge branch 'master' into development
removed database.yml