Vagrant improvements

Fixes #281