Minor fixes.

This rolls back the changes to the catalog and fixes the test that was failing by making the reset for a hive query test optional.

The rational here is that "registering" a table is a purely logical concept that allows us to do overrides and simple catalogs and should not be exposed to the user though the public api at this point.  Regarding the support for other databases than 'default', I realize the current implementation is kinda broken, but I think that is okay and is going to require a bigger overhaul than I'm willing to undertake this close to code freeze.