Merge pull request #6 from seananderson/master

Make a variety of edits to the manuscript
Incorporate Andre's comments and edits