Add matchit

Conflicts:
_vimrc