Section6.4 Edits

Moved some sections and changed some headings.  Added a link where
appropriate.
Fixed conflict, changed above to below
Merge pull request #398 from andyjohnson/6.4edits

Section6.4 Edits