Update vimrc_concatenate
Merge branch 'master' into mac