minor
remove paredit
minor
Merge branch 'master' of github.com:Mestelan/prelude

Conflicts:
	personal/jb-prelude-settings.el