Added xmledit.
Merge branch 'master' into mac
Added matchit as a plugin.
Merge branch 'master' into mac