Update .gitignore

Cleaned up some cruft from what was apparently some sort of a Git conflict.
Merge pull request #12 from leadbaxter/gitignore_cleanup

Update .gitignore