updated catalogs
Merge branch 'master' of github.com:ioos/testbed2_catalog