Some minor changes in yank-pop
Replace mentions of WikEmacs with EmacsWiki
Merge branch 'master' of https://github.com/bbatsov/prelude

* 'master' of https://github.com/bbatsov/prelude:
  Replace mentions of WikEmacs with EmacsWiki
  Some minor changes in yank-pop