Custom taxonomies were generating their own archive page, we don't want this.
Merge branch 'develop'

* develop:
  Custom taxonomies were generating their own archive page, we don't want this.