Text this: An improved message-passing scheme for approximate inference using cluster graphs