Merge pull request #163 from ncdc/sti-integration-tests

Various testing fixes
Add removePreviousImage option to STI build

Add removePreviousImage option to remove the previous image when doing
an incremental build. This avoids the proliferation of <none> images
that pile up with each incremental build.

Fixes #165