Update vimrc_concatenated
Join vim.d into vimrc
Merge branch 'master' into mac