Vagrantfile: cleanup and rorg of provisioning