Use rails convention for development and test database names, and fixed an incorrect/duplicated migration
Ignore automatically generated files that cause merge conflicts