Update Travis config
Merge branch 'master' of https://github.com/Eyescale/CMake
Merge branch 'master' of https://github.com/Eyescale/CMake
Merge branch 'master' of https://github.com/eile/codash
Merge pull request #13 from tribal-tec/master

Late join handling for receiver
Merge branch 'master' of https://github.com/BlueBrain/codash

Conflicts:
	.travis.yml
Update Travis config
Update Travis config