cleaned up catalog/product metadata config
Merge branch 'catalog' into gh-pages