Changing to spfe-config from generic xml-element markup
Change spfe-config-element-name to config-setting for simplicity
Changed subject affinity element names.

Changed spfe-config-attribute-name to config-setting, added ant-element,
and fixed other build issues.
minor markup changes