Merge pull request #3 from randybuildsthings/master

Fix to custom post type template locator. Attempt #2
Merge pull request #5 from randybuildsthings/master

Changes to taxonomy class
Cosmetic: leveling out constant assignments

Lining up the RH values to make Cole happy :)
Merge pull request #4 from beawimp/stage

Stage