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

This reverts commit 3c5363ef9bcfda4cc5cd46ca85a7109f783c9539.
Set WORDCHARS in the editor module
[#52] Add zstyles to configure syntax-highlighting
[Fix #52] Add zstyles to configure history-substring-search
[Fix #419] Rewrite module gpg-agent; rename it to gpg