now qdsearch saves the settings of the measurement too.
Merge branch 'master' of https://github.com/ottodietz/qdsearch

Conflicts:
	views/window_camera.py
	views/window_spectrometer.py