fixed migrations
added back .gitignore to remove ds_store stuff