edited travis to match master