add iterm2 config
Merge branch 'master' of github.com:mortik/dot-files

Conflicts:
	com.googlecode.iterm2.plist