Switch Travis back to upstream master branch