Huge update - vim, zsh, +small updates