zsh highlighting and small vim tweaks.
Merge branch 'master' of github.com:skakri/dotfiles