New zsh config and my aliases.
Merge branch 'master' of github.com:benjie/dotfiles