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
Merge remote-tracking branch 'refs/remotes/upstream/master'