Change SKILLSIT output token to be conditional on being different from the base skill

count function needed a similar change, and also needed to support skill filters.

Issue#: NEWTAG-427, NEWTAG-428


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