Set an explicit priority on the OLE2 match, remove two MS Word matches which were OLE2 ones in disguise, and add an intermediate staroffice parent on the staroffice types. Helps with TIKA-1292 testing

git-svn-id: https://svn.apache.org/repos/asf/tika/trunk@1596611 13f79535-47bb-0310-9956-ffa450edef68