Merge pull request #2 from clyntpinfold/master

Validate name overrides whenever they are used
Roll back changes to RdfTreeGenerator

* Reconsider the validation of duplicate URIs - whilst this problem
remains, the method by which it is handled may need additional
thought.