Improvements and refactoring of code to include correct conditions in chebi_ontology models

Include ontology_data_condition macro, and change the name of public_data_condition macro to dump_data_condition_macro. Fix bug to include the correct compounds in the ontology based on our queries in the chebi-ontology-generator repository. Advanced in chebi_reports