Commiting bugfix to mplZoomWidget that was made on scriptable branch into master branch
dataTakerThread patched
Michel's data taking including delayer.py
Merge branch 'michel' of https://github.com/gervaislab/g2python
Moved all in-code customization of the recordsweep ui into recordsweep.py, so that we can use qt designer to customize ui_recordsweep.py without causing problems.
Slight improvements to the UI layout
added rectangle zoom in recordsweep
Merge branch 'master' into scriptable

Conflicts:
	recordsweep/DataTakerThread.py
	recordsweep/mplZoomWidget.py