Merge remote-tracking branch 'upstream/pr/50/head' into feature/mpi-pf

backmerging PR #50 of @memmett

Conflicts:
	include/pfasst/encap/encapsulation.hpp