Remove catalog changes
Add an option to skip reseting the TestHive instance.
Merge pull request #1 from marmbrus/pr/195

Minor fixes.