removing paperclip and aws gems
tmp commit before removing db config file
resolving gitignore conflict
seeding db
fixing migration format