More improvements to Travis-CI