Minor edits

Note: the ontology will soon be in an RDF/XML format for easier
consumption with Python. Also, we're in the process of phasing out
certain "other" and "no data" classes.
Class cleanup, Updates with indexing

This will get additional edits. Also need to update references to the
ontology to remove links to deprecated entities.