Adhoc build 1.0.0.20140617_224912
Code cleanup
Merge branch 'master' of https://github.com/gnachman/iTerm2