Clean up and simplify the .gitignore rules