add support for 'os_name' productid attribute
s/os_name/os
Change brand attr 'os' to 'brand_type'
Merge pull request #89 from candlepin/alikins/flex_branding

Alikins/flex branding