Lots of zsh and vim changes