Update .gitignore

Looks like some kind of Git conflict cruft found itself into the .gitignore file