A bunch of Vagrantfile improvements