Remove unnecessary .gitkeeps

Given that there are files already present in these directories the `.gitkeep`s are unnecessary.
Merge pull request #2546 from karlfreeman/clean-up-gitkeeps

Remove unnecessary .gitkeeps