Merge pull request #164 from mpeuster/master
authorpeusterm <manuel.peuster@uni-paderborn.de>
Mon, 22 Aug 2016 06:59:58 +0000 (08:59 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Mon, 22 Aug 2016 06:59:58 +0000 (08:59 +0200)
Fixes and Vagrant improvements


Trivial merge