VVWM, SWC, and PRZM5 templates
Merge branch 'jon' into sprint9