Update .gitignore

Cleaned up some cruft from what was apparently some sort of a Git conflict.