.gitignore consolidated