loads of zsh changes
Merge branch 'master' of github.com:jaz303/dotfiles