fix boilerplate issues
clean up schema
Merge branch 'master' of https://github.com/facet/commerce