overhaul by Bas.
Merge branch 'master' of https://github.com/wpfff/qtlab-user-diamond-master

Conflicts:
	scripts/espin/simple_electron_rabi.py
	scripts/ssro/ssro_calibration.py
	scripts/teleportation/parameters.py