Merge branch 'stage' into feature/archive-template

* stage:
  Cosmetic: leveling out constant assignments
  More taxonomy wrangling
  Changes to taxonomy class
  Get that template_include filter under control
  Reversed the conditional for is_single()
  Better version of template locator hook
  Fixed template location for custom post type
Fixing helper functions to utilize updated taxonomy names and some more error checking
Merge branch 'feature/archive-template' into stage

* feature/archive-template:
  Fixing helper functions to utilize updated taxonomy names and some more error checking