Make output pane a config option
Merge branch 'master' into output-pane-config-option
Fix and cleanup tests