Fix to custom post type template locator. Attempt #2

Okay, I think this is more in line with what you're wanting to see. Best of all, it actually works.

Also it now means the templates get used, and we can't see the actual custom posts rendered yet. Yay!