Add categories.
Update mapping.
Merge branch 'master' of github.com:cocoa-tree/categories