measurements and params, hannes
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	scripts/bell/sweep_Bell.py
	scripts/ssro/ssro_fast.py