Combine numeric/waveform and clinical mapping tables

[alexhamiltonRN]

Mapping object returns category information so I don't think this would cause problems -- might even make it slightly easier i.e. user only needs to specify MIMICIII or KHSC to get the full mapping table.