closes #360 with no changes
closes #472
closes #469
closes #462
closes #468
closes #466
closes #404
closes #444
closes #355

This commit fixes some outstanding issues.  It also cleans up the toc file
and merges few files together.  We can now delete a few files that are no longer
needed since the breakup.