Updates to remove some deprecated/obsolete references
Updates catalog listing
Merge pull request #138 from timwindsor/master

Updates Catalog listing and some obsolete references