update some plugin

add plugin matchin.vim
fix merge errors