Merge gitignores
Put everything back into the root directory preparing for repo rename and heroku push