DO NOT PULL: WB183

Integrate an hcatalog build.  Trying to determine if i should use more than 1 submodule, or if I should build a separate wrapper for each.