start of controller separation
Merge branch 'discovery_gui' into gui-controller

Conflicts:
	pyrf/gui/gui.py
move open device and reactor access into main window
gui_config whitespace
remove unused module
SpecAState
SpecAState: generate/consume json objects instead of strings
WSA*Properties add DEFAULT_SAMPLE_TYPE
WSA5000*Properties: break up wall of dicts with newlines
WSA5000*Properties: corrections for IQIN, DD
WSA5000*Properties: use * M
WSA*Properties: add SPECA_DEFAULTS
fix forgotten )
Merge branch 'master' into gui-controller
correct pll_reference speca default
more robust ip detection in list click
SweepEntry fix rfe_mode setting
sweep device: fix points required for sh mode
Merge branch 'master' into gui-controller

Conflicts:
	pyrf/devices/thinkrf.py
	pyrf/gui/gui.py
	pyrf/gui/gui_config.py
merge fixes