Update database.yml.example to work better
Remove rails image
Merge branch 'database' into develop