Merge pull request #1 from mrocklin/mwiebe-2014

slight edits to outline
Merge branch '2014' of github.com:mwiebe/scipy_proceedings into mwiebe-2014
minor edits