Add solarized to color presets
Resolve merge conflicts
Undo change to iTerm.plist's bundle id