Make Travis CI show merge commit parents

If we ever have weird Travis CI test failures involving recent code, but tests pass on our own machines, this might help determine the cause.