Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:zhengyi13/prelude
Merge remote-tracking branch 'upstream/master'

Conflicts:
	sample/prelude-modules.el
Some minor changes in yank-pop
Replace mentions of WikEmacs with EmacsWiki
Fix key-chord module commentary.
Merge pull request #439 from seanfisk/fix-key-chord-commentary

Fix key-chord module commentary.
[Fix #416] Add quotes to the alias examples
Merge branch 'master' of github.com:bbatsov/prelude
[Fix #436] Enable smartparens-mode in latex-mode
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:zhengyi13/prelude