Split out the amazon and virtualbox/vmware templates
Set guest OS type
VMware installs the tools