Rework travis setup