better exceptions, and support for definitions
Merge branch 'master' of https://github.com/projectdanube/xdi2.git