some tidying up
Merge branch 'new' of github.com:imcleod/novaimagebuilder into new