OSGi+YAML support in catalog

This adds OSGi and YAML support to catalog.  There are a few remaining issues but this code has been reviewed and tested quite a bit.  Incorporates #38, #39, and #31.