Some more tweaking of the travis setup.