Reorganise travis configuration

Required for #211