Handle prefs that refer to nonexistent tools
Merge branch 'v2' of https://github.com/gnachman/iTerm2 into v2
Remove some assertions that would fire in convertSelectionStartX...