cal_scale handles 2D data
cal_scale handles 2D data

Other cleanups too.

--CAR

rmcgurrin/Qlab,BBN-Q/Qlab,BBN-Q/Qlab,BBN-Q/Qlab,rmcgurrin/Qlab,Plourde-Research-Lab/Qlab,Plourde-Research-Lab/Qlab,BBN-Q/Qlab,rmcgurrin/Qlab,rmcgurrin/Qlab,Plourde-Research-Lab/Qlab