A bunch of Vagrantfile improvements

I totally agree.