Fixed problem with setting 'no hypervisor' on VM's
Fixed overzealous delete for stored vm's
Merge branch 'test' into dev