Fixed the .gitignore file

.gitignore had remnants of past merge conflicts.

Just doing some cleanup.