New zshrc from my new desktop install.
Merge branch 'master' of github.com:sabrsorensen/dotfiles

Conflicts:
	zsh/zshrc.symlink
    Merged together window title updating and two aliases.