Some minor changes in yank-pop
Replace mentions of WikEmacs with EmacsWiki
Merge remote-tracking branch 'upstream/master'