Removed matchit plugin, and added line to vimrc to include the version that comes with vim in its macros folder