Replace show-parens-mode with show-smartparens-mode
Merge branch 'master' of github.com:bbatsov/prelude
updated readme to include new magit bindings
Merge pull request #404 from ceterumnet/master

updated readme to include new magit bindings
Merge remote-tracking branch 'upstream/master'