Moar cleanup
Merge branch 'master' of github.com:RalfNieuwenhuizen/DeViDe-multiVWR