Renamed database.example.yml to database.yml again.
Merge branch origin/master into augmenting112...

Merge remote-tracking branch 'origin/master' into augmenting112_ontology_link_graph