Merge branch 'patches/marcus/stripchart'

Merge branch 'patches/marcus/stripchart'

Conflicts:
	gr-wxgui/src/python/scope_window.py

* Adds new scope window trigger, TRIG_MODE_STRIPCHART
* Allows config file selection of whether background window sinks still run
* Allows config file selection of default trigger mode
* Allows config file selection of default waterfall sink color mode

[wxgui]
#Setting this to true prevents the window sinks from stopping when they
#are not displayed, as when they are in a notebook with a hidden tab.
run_always = False

# Default scope trigger mode.
#
# 0 = Freerun
# 1 = Auto (default)
# 2 = Normal
# 3 = Stripchart
trig_mode = 1

# Default waterfall sink color mode.  Valid choices are 'rgb1', 'rbg2',
# 'rgb3', or 'gray'
waterfall_color = rgb1