Pull EECA-training-2022 into updates-june-2022

[kelvinburke]

Make sure they are up to date with each other

Includes:

• Splitting other death and emigration and adding outputs for emigration
• Reworking init.py
• Added yupperlim for cost-cov graphs
• Improved adding condom data to data, prefer (M,F) and sort (M,M) alphabetically