Update vimrc
Update zshrc.custom
Merge remote-tracking branch 'origin/master'
Fix .vimrc