Implement Warpriest & a couple PFS fixes
Merge pull request #125 from mjmeans/pfs

Implement Warpriest & a couple PFS fixes