m2 analysis fixes
machiel analysis
teleportation scripts
Merge branch 'master' of github.com:wpfff/diamond-analysis

Conflicts:
	scripts/teleportation/BSM_calibrations.py