updated the master gitignore, removed extraneous gitignore file