Some updates for Complete Champion support
Merge branch 'master' of github.com:BahamutDragon/pcgen