fix bug where arrange horizontally computed the wrapping position incorrecly if the screen's visible frame wasn't 0
Merge branch 'v2' of https://github.com/gnachman/iTerm2 into v2