Merge pull request #73 from eile/master

Integrate common CMake stuff using git externals
Merge branch 'master' of https://github.com/Eyescale/Collage
Update Travis config