Handle inserting emoji text in mavericks with cmd-ctrl-space, which sends an attributed string to -insertText:

Fix race condition that threw an exception in ProcessCache when getNameOfPid:isForeground returned nil.

Don't underline null characters. Also, draw underlines before hacking up the character run, which caused the wrong range to get underlined

Make it possible to load prefs from nightly build by not requiring exactly three components in color dicts

Merge branch 'adhoc_1.0.0.20131209_154745' into v2 (use CTFontDrawGlyphs only when there are combining marks, otherwise use attributed string)

Use NSAttributedString to draw complex chars unless they contain combining marks. This should improve performance.

Fix bug 2744 where nonascii characters would randomly translate or scale by initializing the text matrix in the graphics context

Make the hotkey window go all the way off the screen. It was incorrectly using the screen's visible frame to compute its offscreen position. Fixes bug 2638

Fix bug 2716 where users with dots in the thousands place would lose most of their lines of scrollback