update to vimrc and zshrc
merge stuff