Round font width rather than using floor because with 11pt monaco, it was too tight (eg on O])
Merge branch 'v2' of https://github.com/gnachman/iTerm2 into v2