Codesniff cleanup for categories model
Merge branch 'master' into cs_categories_model
Merge remote-tracking branch 'dstockto/cs_categories_model'