From Tom's repo
Organize the Vagrantfile a little more