Partially inline vagrantfile
Merge remote-tracking branch 'origin/master' into vagrant-link-572
Numbered link
Merge pull request #575 from ClusterHQ/vagrant-link-572

Partially inline vagrantfile