Travis refactor

Do not merge