Check range before calling highlightWithColors:fromPoint:toPoint to fix crasher in bug 2490
Show window number even if it's 9 or greater
Turn off ligatures. Fixes bug 2498
Merge branch 'v2' of https://github.com/gnachman/iTerm2 into v2
Fix emoji
Tolerate hotkey code of 0 and hotkey char of 0, as long as they're not simultaneous.
Make some changes to try to fix a common crash in setFastTimer when it's called from a notification when we become key
Change threshold for doing slow updates to 1024 bytes (see bug 2512)
Merge branch 'v2' of https://github.com/gnachman/iTerm2 into v2