Fixing bad merge and moving private .zshrc stuff to another file
Merge branch 'master' of https://github.com/ChrisWeiss/.dotfiles