Refactor to use travis:default