Fix merge conflicts
When a preset is added or removed, make sure it affect all preference panels
Merge branch 'v2' of https://github.com/gnachman/iTerm2 into v2
Add bonjour verbose logging
Resolve merges