Update vagrant config.
Merge upstream and fix conflict.
Merge pull request #396 from connormanning/vagrantUpdate

Update vagrant config.