Bind prelude-top-join-line to C-^
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.
Fix #337 - don't promt for sudo passwd for non-existing directories
Merge commit '457017a5a68f18de19087feb64e069775358836d'
Merge branch 'master' into rock-mac