first local commit; modularized database.yml
resolved conflicts re gitignore and db.yml