Fix up some spacing issues
Refactor and change parsing of categories/taxonomies. Much easier syntax, and syntax is shared among both.