resolve conflicts
add saucelabs support directly from travis.yml