Merge pull request #162 from mpeuster/master

Improved Vagrant setup