Merge pull request #45 from eile/master

Build and tclap tweaks
Merge branch 'master' of https://github.com/Eyescale/Collage
Fix Bamboo build
Merge pull request #47 from eile/master

Fix Bamboo build
The real Bamboo fix
Merge pull request #48 from tribal-tec/master

The real Bamboo fix
Use correct master node for mapping objects
Merge pull request #50 from tribal-tec/master

Use correct master node for mapping objects
Unit test to benchmark n memcpy+one send against n sends
Merge branch 'master' into issue40
Merge branch 'issue40' of https://github.com/eile/Collage into issue40

Conflicts:
	tests/zeroconf.cpp