A bunch of Vagrantfile improvements

Good catch. Will add that.