Fixes #243.  Corrects issue where templates are not properly prioritized.
Also fixes issue where portfolio theme did not correctly name template
Merge branch 'master' into issue/PB243
Merge pull request #244 from pencilblue/issue/PB243

Issue/pb243