Switch iTerm2 tab color when ssh'ing
Load iterm2.zsh on startup
Merge branch 'master' into use_rvm

Conflicts:
	zshrc