Add assert to try to find crash
Use CGFontGetGlyphAdvances instead of sizeWithAttributes in FontSizeEstimator.m to deal with change in later SDKs
Merge branch 'v2' of https://github.com/gnachman/iTerm2 into v2