Revert "Roll back to original .gitignore"

This reverts commit 8f7a9887f03fcd6afef44f18170783c9b9ec4e7a.
Merge pull request #651 from jameshilliard/gitignore

Revert "Roll back to original .gitignore"