Enable erase-buffer
Make prelude-rename-file-and-buffer vc aware
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.
Add a few more ace-jump keychords
Merge remote-tracking branch 'origin/master' into dev