zshrc cleanup (and use short work dirs)
Merge branch 'master' of github.com:cespare/dotfiles