consolidated .gitignore