Add vSphere support

Remove this and use the established mechanisms to wait for things.