Austin Bingham Merge branch 'master' of https://github.com/abingham/categories-for-p… …