minor code adjustments (no changes in generated RDF files)
fix #9 : for each vocab, include only relevant base definitions