Merge branch 'master' of git://github.com/bbatsov/prelude
Unbind conflicting prelude-mode keys.
Don't kill entire symbol at point when doing sp-hybrid-kill
Add a note for updating packages
Merge pull request #396 from climatewarrior/fix-org-bindings

Unbind conflicting prelude-mode keys.
Enable smartparens only for programming modes
Add a comment
Highlight the : in comment annotations as well
Extend update instructions
Add prelude-find-user-init-file
Add prelude-find-shell-init-file
Add anzu
Disable anzu temporarily due to a bug in it
Add prelude-show-foreign-packages
Revert "Disable anzu temporarily due to a bug in it"

This reverts commit 239571f17be8cff4381d583b8ea4388024f11703.
nrepl-mode is now nrepl-repl-mode
Pass prelude-kill-whole-line input as number ("p")
Merge pull request #401 from dillonkearns/fix-kill-whole-line-arg

Fix bug in prelude-kill-whole-line with prefix argument
Replace show-parens-mode with show-smartparens-mode
Merge branch 'master' of github.com:bbatsov/prelude