Npar=2 maco
Merge branch 'master' of https://github.com/nucleosynthesis/EnvelopePaper
Merge branch 'master' of https://github.com/nucleosynthesis/EnvelopePaper
Merge branch 'master' of github.com:nucleosynthesis/EnvelopePaper into matt_development