Enable mouse scrolling in iTerm
DEL during isearch should edit the search string, not jump back to the previous result
Merge remote-tracking branch 'upstream/master'