Update .gitignore

Cleaned up some cruft from what was apparently some sort of a Git conflict.

Note: this might explain how the .DS_store files got into the repo!