Update travis yaml with branch info
merge commit