merge fix
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:zhengyi13/prelude
Merge branch 'master' of github.com:zhengyi13/prelude
Merge branch 'master' of github.com:zhengyi13/prelude
upstream merge
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
updated readme to include new magit bindings
Merge pull request #404 from ceterumnet/master

updated readme to include new magit bindings
Fix inf-ruby config
Disable annoying blink-matching-paren
Remove an obsolete (and incorrect) config
Fixed: print command not found
Merge pull request #408 from dongweiming/master

Fixed: print command not found
Merge remote-tracking branch 'upstream/master'