Fix conflicts in the NFD on my side; add missing files; fix names to match new standards.

git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk@20639 ef53c05b-3124-4d59-ae7d-fe3273f42be7
Zipped set I have, submitted by Ben Mullen


git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk@20640 ef53c05b-3124-4d59-ae7d-fe3273f42be7