Added Oxford IPS120 driver
added selection of X and Y plots in recordsweep
resolved conflicting versions of recordsweep
Merge branch 'demo' into HEAD

Conflicts:
	recordsweep/recordsweep.py
Start adding channel params to recordsweep GUI
Recordsweep now configured from file or GUI
Add save figure to recordsweep.py
fixed bugs in recordsweep (tested on real hw)
Cleaned up recordsweep
Added pan and zoom to recordsweep.py
recordsweep: debugged, runs on real hw
recordsweep debugging
merging to push to ben741
merging to push to ben741 again
merged ben741 version of master
merging demo into master
add example configuration file to recordsweep
Merge branch 'master' of https://github.com/gervaislab/g2python