Try to reinitialize APS after lost-lock situation.

Try once and error out otherwise.

--CAR and TAO
Bug-fix for cal scale bottom plot.

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

Conflicts:
	analysis/cQED_dataAnalysis/cal_scale.m