Merged .gitignores

removed a few cache files while I was at it.