updates vimrc to ignore some lint errors
Merge remote-tracking branch 'origin/zsh' into zsh