Ensure panes aren't erroneously reset.
Improve placement of watched output.

Previously, output was always placed in the second pane. This change
places it in other, more appropriate panes, depending on which one is
currently active.
Merge pull request #197 from markalfred/watched-placement

Improve the placement of watched output.
Merge remote-tracking branch 'upstream/master'