Reorganize the glossary and move ORM conventions in.

The new ORM conventions section has confused a few people. The feedback
I've received about this section is that it belongs better in the
glossary.