Merge remote-tracking branch 'upstream/master'
some small cleanups of the postdoc plan; looks good.
Merge remote-tracking branch 'upstream/master'
need to separate out all of these extra sections. changed the formatting to be consistent with the rest of the proposal.
botched this last time.
Merge pull request #66 from rachelslaybaugh/master

cleanup of parts and pieces; they need to be separate.