Update with latest code changes
Trying out saucelabs + travis CI