Vagrant support
Vagrant
update vagrant
Merge pull request #129 from mattiashem/vagrant

Vagrant
Manual merge into version-0.3.1