added octopress/org ... not a great idea ?
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
Extract prelude-start-or-switch-to
Clean up Emacs Lisp config
Merge branch 'master' of github.com:bbatsov/prelude

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Don't run checkdoc checker on elisp test files
Fix a typo
Recenter the screen after goto-symbol
Merge pull request #311 from toctan/master

Recenter the screen after goto-symbol
Disable yas-minor-mode in term-mode