Update vimrc
Update s
Merge branch 'master' into qwerty