Update .gitignore

Manually merge local changes with github because I clearly don't know what I'm doing