Began editing and reorganizing.
Merge branch 'master' into intro
Revised intro chapter.