Add ZFS to vm images.

Add ZFS to vm images.
Yeah, that was crossing my mind too.

While we're at it though, there's a lot of goofy not-quite-copypasta between these two scripts.  Do you think it's worth the effort to try to dissolve that, or should we just not worry about it?