fix merge conflict in gitignore
merge conflict in .gitignore
Merge branch 'master' of github.com:zhengyi13/prelude
Fix lisp code blocks in README.
Fix `prelude-smart-open-line-above`
Merge pull request #330 from seanfisk/fix-lisp-readme

Fix lisp code blocks in README.
Fix keychord mention
Merge pull request #331 from toctan/master

Fix `prelude-smart-open-line-above`
Add new command `prelude-top-join-line`

Saner version of the built-in `join-line`, that joins lines from the top
to the bottom.
Recompile the Prelude dir on `prelude-update`
Merge remote-tracking branch 'upstream/master'