incremental work on complex characterizatoin
Merge pull request #23 from ajvizedom/master

incremental work on complex characterizatoin
Merge pull request #24 from AndreaWesterinen/master

Updated top.owl to rename concepts from 'OntologyXxx' to 'VOXxx', including renaming OntologyLanguage to VOExpressivity (and creating new subclasses), cleaned up annotation properties (moving notes under comment), added and updated some individuals.

This closes issues #15, #16 and #24.
change colliding IRI

vocref-top-annotations-to-add had same IRI as vocref-top.
Merge pull request #29 from ajvizedom/master

change colliding IRI
one more line fix needed for IRI collision fix
Merge pull request #31 from ajvizedom/master

one more line fix needed for IRI collision fix
Merge remote-tracking branch 'upstream/master'