Tidying and consolidating .gitignore's