Full draft
Merge branch 'master' of https://github.com/timocaldwell/parameter_opt_paper
Full draft