Updated some categories.
Not adding other category for now. Left this commented out until we find THE RIGHT WAY to not include components.
Merge pull request #1793 from flukeout/categoryupdate

Category updates