Change disco namespace to rdf-vocabulary.ddialliance.org
Merge changes