Changes to vimrc and zshrc, misc others