fixed Juans changes to the vignette
Minor edits prior to merging vignette branch

Some edits are only structural (line breaks for future ease of git).
Merge branch 'edit-vignette'