corrected version of ethans bio.
Merge remote-tracking branch 'upstream/master'
Merge pull request #40 from gvwilson/master

Filling in some more blanks
Markdown version for sharing with non-Gits
surrent and pending support for lorena
Merge remote-tracking branch 'upstream/master'
readthrough of proposal with small cleanups.
read through of proposal with a bunch of small changes. Have some larger comments that I'll make on the pull request on github.
Merge pull request #41 from rachelslaybaugh/master

Some small changes
Adding a few notes from Rachel's comments
Integrating @rachelslaybaugh's changes, filling in some comments