cal_scale handles 2D data

Other cleanups too.

--CAR
load_data allow single quadrature plots

--CAR
Make sure Agilent has settled at new frequency

--CAR and BRJ
Refactor broken jsonlab to json

--CAR
Update data file handling in TrackedSpec example

Also add settings header.

--CAR
Report best integration time

--CAR
Merge branch 'develop' of github.com:BBN-Q/Qlab into develop

Conflicts:
	analysis/cQED_dataAnalysis/cal_scale.m