Simplify zsh configuration files
Update vimrc