edits to outline
Merge pull request #1 from mrocklin/mwiebe-2014

slight edits to outline