[vimrc] adjust write/quit mappings
Merge branch 'master' into work