Rename formats: "Office 20xx" -> "MS Office 20xx", "M$ Cashe" -> "MS Cashe"

This has been discussed here:
http://www.openwall.com/lists/john-dev/2013/10/24/3

Also, Changed "M$Office word" to "MS Office Word" in zip2john.c