Add a few more packages to auto-install
Try to resolve a potential problem with tuareg-mode and which-function-mode
Enhance a bit stock dired 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.
Merge remote-tracking branch 'upstream/master'