Scripts and spin_pump duration, THT
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	scripts/espin/darkesr.py
	scripts/ssro/ssro_calibration.py