* add fix for (#1135) Taxonomies with identical slugs now get merged (#1136)
* update templates so they propperly render taxonomy names
* squash! add fix for (#1135) Taxonomies with identical slugs now get merged (#1136)
reimplement taxonomy deduping
* revert unwanted changes to templates
* add tests for unic in permalinks
* add tests for unic in permalinks