Add attributes
Merge pull request #47 from zenoss/feature/catalog_refactor

Add attributes