Edit .gitignore (and some unknown changes)