Update vimrc_concatenated
Merge branch 'master' into mac