Beginning of Dan's paper revisions
Merge branch 'master' of github.com:jakehschwartz/parawrap