Refactor Travis rig