File: 5.18_1 - File - determine file type

Remove the questionable magic change from msword to msoffice,
as it makes this build of file act differently from the officially
distributed version of file.

Add some fixes committed post-5.18 mainly to fix incorrect output
for many image types (e.g. PNG).