Changed datamodel for keywords and related
Horrible surgery to rationalise DM
All tests pass with new DM changes
Updated XSL for 1.7
Updated config validation with DM changes
Checking DOT output tests
Nasty merge from dev