Include scrollerCutOff when computing scroll height

Closes #2321
Move height setting out of updateScrollBars

Issue #2321
Pass an options object to selection methods

Require explicit turning on of history event merging.

Issue #2305