lasermeister commit
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	instruments/QuTau.py
	lib/cython/error_lib/build/temp.win32-2.7/Release/errors.o
	lib/cython/error_lib/errors.c
	lib/cython/error_lib/errors.pyd
	lib/cython/hh_optimize/build/temp.win32-2.7/Release/hhopt.o
	lib/cython/hh_optimize/hhopt.c
	lib/cython/hh_optimize/hhopt.pyd
	lib/cython/hh_optimize/hhopt.pyx
	lib/cython/hh_optimize/hht4.py
merge