[ append .vimrc ]
Merge branch 'master' into HEAD

Conflicts:
  .vim/config/.vimrc