Update vimrc
Refactor zshrc