Unbind conflicting prelude-mode keys.
Don't kill entire symbol at point when doing sp-hybrid-kill
Add a note for updating packages
Merge branch 'master' of https://github.com/bbatsov/prelude

* 'master' of https://github.com/bbatsov/prelude:
  Add a note for updating packages
  Don't kill entire symbol at point when doing sp-hybrid-kill
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
Merge branch 'master' of https://github.com/bbatsov/prelude

* 'master' of https://github.com/bbatsov/prelude:
  Highlight the : in comment annotations as well
  Add a comment
  Enable smartparens only for programming modes
  Unbind conflicting prelude-mode keys.
Extend update instructions
Add prelude-find-user-init-file
Add prelude-find-shell-init-file
Add anzu
Merge branch 'master' of https://github.com/bbatsov/prelude

* 'master' of https://github.com/bbatsov/prelude:
  Add anzu
  Add prelude-find-shell-init-file
  Add prelude-find-user-init-file
  Extend update instructions
Clean code