Use canonical vagrant-butcher (because he accepted our PR :).

Change node name in Vagrantfile
Merge branch 'master' of github.com:theodi/vagrant-dev-environment