Split apart the image creation bits to make it more flexible.

This allows us to more easily:
1) play around and test setup-fn's
2) manually setup images that we still snapshot