Tidying up .gitignore files

Consolidating where possible