Tidy up the local file storage for images
Merge pull request #1375 from jamesbloomer/image-refactor2

Tidy up the local file storage for images