Update .gitignore

consolidating two files. don't care about duplication or neatness :)