ontology fix
Merge remote-tracking branch 'origin/master' into ontology_fix
Merge pull request #317 from ENCODE-DCC/ontology_fix

Ontology fix