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

Vagrant
Manual merge into version-0.3.1
Merge pull request #130 from kribor/version-0.3.1

Merging in changes from master into working branch