Switch to building a VMWare image
Support both VMWare and VirtualBox.