Add smex and ido-ubiquitous for better `M-x`
Merge branch 'master' of https://github.com/bbatsov/prelude
Correct the packages alphabetical order
Restore compatibility with Emacs 24.2
Merge pull request #305 from toctan/master

Add smex and ido-ubiquitous for better `M-x`
A couple of minor improvements
Add some missing docstrings
Shorten the names displayed in prelude-recentf-ido-find-file
Don't try edit dired buffer as root
Fix indentation
Merge pull request #310 from lukerandall/dont-sudo-dired

Don't try edit dired buffer as root
Merge pull request #10 from bbatsov/master

Update with bbatsov
Merge branch 'master' into shiquanwang