Cleanup/modify vimrc and zshrc