Vagrantfile and a few other changes