Clean up .ignore files

- Incorporation of the content of supplemental .ignore file into the primary one.
- Deletion of empty .gitkeep file.

Fixes #5828 (probably).