Generate new rails app with postgresql and no test-unit
Fix merge conflict in .gitignore after new app generation