Fix broken merge.
Merge branch 'master' of https://github.com/fniksic/mpi-sws-vscomp
Hostmaster weirdness implemented.