Bell Changes, form LT3
Merge branch 'master' of https://github.com/teamdiamond/measurement
From BS, Bell changes
Merge branch 'master' of file:///y:/measurement/ into bs_branch

Conflicts:
	lib/cython/PQ_T2_tools/T2_tools_bell.pyd
	lib/cython/PQ_T2_tools/T2_tools_src/T2_tools_bell.c
	lib/cython/PQ_T2_tools/T2_tools_src/T2_tools_bell.pyd
	lib/cython/PQ_T2_tools/T2_tools_src/build/temp.win32-2.7/Release/T2_tools_bell.exp
	lib/cython/PQ_T2_tools/T2_tools_src/build/temp.win32-2.7/Release/T2_tools_bell.lib
	lib/cython/PQ_T2_tools/T2_tools_src/build/temp.win32-2.7/Release/T2_tools_bell.obj
	scripts/bell/bell.py