Tweak CI settings
Merge branch 'master' of https://github.com/Eyescale/Lunchbox
Merge branch 'master' of https://github.com/Eyescale/Lunchbox

Conflicts:
	.travis.yml
CI tweaks