Updated importer to get default primary dsid from the derivitave hook, already i use in all solution packs.
Removed unused hook definition, and unused define.
Updated xpath expression.
Fixed xpath expression.
Merge pull request #26 from MorganDawe/7.x

Primary data-stream refactor