Restructure vocabulary-related sections

Attempt to make this more understandable by removing
some duplication, putting things in the right order,
and explaning certain things more clearly.  Hopefully.

Author: handrews