Fix whitespace
Merge branch 'v2' of https://github.com/gnachman/iTerm2 into v2
Only call TranslateCharacterSet on ascii strings. Fixes bug 2630.