Reorganize .gitignore to make better use of its features