Sort Git conflict aliases
Update external history-substring-search
[Fix #422] Revert "Remove no longer necessary key bindings"

This reverts commit 3c5363ef9bcfda4cc5cd46ca85a7109f783c9539.
Merge branch 'master' of https://github.com/sorin-ionescu/prezto