Travis CI config
Update Travis CI config
Update dependencies
CI tweaks
Fix build
Merge branch 'master' of https://github.com/Eyescale/Collage