Merge branch 'MacVim'