Merge branch 'adhoc_1.0.0.20131215_173946' into v2
Merge branch 'v2' of https://github.com/gnachman/iTerm2 into v2
Make it possible to load prefs from nightly build by not requiring exactly three components in color dicts