Vagrant test setup
Bugfixes after Vagrant testing