Merge pull request #164 from mpeuster/master

Fixes and Vagrant improvements