Travis CI fixes (code review only - do not merge!)

This is for code review only until [bug 888506](https://bugzilla.mozilla.org/show_bug.cgi?id=888506) has landed and a subsequent Marionette client version has been released. This pull re-enables Travis CI builds for master, and skips tests if the required test variables are not present.