nothing much
Merge branch 'sliders' into MEASURING

Conflicts:
	recordsweep/delayer.py
	recordsweep/scripts/script.py
FEW CHANGES
Few changes on SRS830 and IPS120 made by ben
Merge branch 'SuperInterferometer' of https://github.com/gervaislab/g2python into SuperInterferometer

Conflicts:
	recordsweep/G2Gui.py
Merge branch 'MEASURING' into SuperInterferometer

Conflicts:
	recordsweep/DataTakerThread.py
	recordsweep/scripts/script_nanohole.py
xommit before checkout
wierd stuff happend
Merge branch 'SuperInterferometer' of https://github.com/gervaislab/g2python into SuperInterferometer

Conflicts:
	drivers/KT2400.py
	recordsweep/G2Gui.py
Merge branch 'SuperInterferometer' of https://github.com/gervaislab/g2python into SuperInterferometer
there is still some bugs, the new GPIB isolator was messing up the connexions, then we can talk with the keithleys but not with SRS830
now the KT2400 have a safety feature, the interferometer is not working very well with the auto sweep