Update to 20140629
Merge branch 'master' of github.com:chef-osx/iterm2