More of the structured data handling
Fix up the test harness deps
Merge branch 'master' of github.com:infobelt/skye