Clean up Vagrantfile and add support for vmware