Update .gitignore

Consolidated a couple of gitignores, including gitignore.io.