PFS & ACG updates

This should resolve the merge problem as long as no other PR's that change the files that this changes are pulled in when based upon a much older master.
I'm trying to understand this change - We added a tab and removed the Naming element to break with proper name?
Just making sure you see what I'm seeing. Everything in this section to maintain consistency is "Crossblooded Rager Power" and then the other portion of the name since if we used the original we'd be overriding a real class feature. So why have we renamed "Power of the Elements ~ x" to "of the Elements ~ x'?