Organize database.yml.
Merge pull request #74 from JunichiIto/organize-database.yml

Organize database.yml.