More Vagrantfile cleanup