Adds iTerm2 support and some zshrc modifications
Merge branch 'master' of github.com:zcei/dotfiles

Conflicts:
	iTerm/com.googlecode.iterm2.plist
	zshrc