Osc traces working, with time coord and a 2nd parameter
incremental
Fixes to AFG driver and AFG library/spec for N level pulse
early draft AWG DSO melon setup
adding time trace 2d sweep to melon

also messing with afg 3lvl pulse
a utility instrument for 3 level pulses
independent files for many-trace data
debugging & improvements
edit to InfiniiVision driver to align t=0 with the first data point by default
set offset AFTER setting range to override
made generic_lab folder - contains generic experiment, lab, and support classes, will eventually also contain generic specs for AWG, OSC adn other instrument drivers
slightly updated
wrote test script, + some fixes
running and fixing - Yay!
small amount of fiddling and unfiddling
getting basic test to work
stupid compile errors sorted
*MMcE please sight all changes*
Merge commit '1da8b93c32c5085fff2443a99f82c06faca3887c' into merging_gmap_&_lemon
incremental content, tidy up
Matt's jar class for fast data storage & manipulation  - somewhat tested
today i fixed bugs in gen_lab
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