Cleaned up plugins. Enabled matchit.