Merge pull request #132 from unwin/develop

BUG 4367 This allows for custom images to be removed.  Added
Merge pull request #134 from unwin/develop

enable tests by default in develop. useful for me, but required for
testing github jenkins webhook
jenkins github hook testing