Replace mentions of WikEmacs with EmacsWiki
Pull in upstream changes.