Initial commit
Makes local .gitignore changes
Merges gitignores