Make minor spec refactor and additions

This commit adds a little more context to document types and moves
merging models, model metadata, and node values to the bottom of the spec.
These sections previously came before defining shapes and traits, but
they're very much in the weeds for someone just trying to read the spec.