fixed the naming convention between keys and key_combos and added a check itno the routing_info object to check the assumption that key & mask = key.

This is after a rather long debate with rowley over how we represent these objects and concepts