Resolving .gitignore problems