various changes for travis-ci sauce-labs integration