measurement params stuff
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	instruments/adwin.py