Viper series measurements @ 4K, plus D198 tripledot
D168 and D198 scripts, about a million runfiles from Matt at the CF fridge mostly
device scripts: X2 185 53 55 56 40
improved hall bar scripts from joris
some fixes:
mercuryIPS improvement
srs830 edit
ipapi fix for ipy v1+
logging -> INFO
tests versions of instrument drivers ???
drivers and scripts
dev53 scripts. 1st set
ignore ipython nb launcher
Merge branch 'master' of https://github.com/samhile/QTLab

Sooo tricky - i hope it works

Conflicts:
	bilby/aff_scripts/lemon.py
	bilby/aff_scripts/sc.py
	qtlab_013/init/02_qtlab_start.py
dev53 more runs
Merge branch 'master' of https://github.com/samhile/QTLab
Fixed AWG get on/off command (tek).
Put in timebase_origin into Agilent
dev53 update
Merge branch 'merging_gmap_&_lemon'

NOTE: if you get some ipapi error, then upgrade your ipython version -sam

Conflicts:
	.gitignore
	bilby/instrument_plugins/x_Agilent_3024A.py
	qtlab_013/source/lib/misc.py
averages mode for osc
Scope's digitize function properly polls the operation complete register, so manual sleep times are unnecessary! yay
oscilloscope cycles stuff (the messy version)
dev53 scripts
repairs for 3levpulse scope and awg
new driver (unfinished) for sim965 filter