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
[Fix #426] Correct syntax error in variable assignment
Ensure that the tmux server is started

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
Correct syntax error in variable assignment

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Correct syntax error in variable assignment
  Ensure that the tmux server is started
  [Fix #426] Correct syntax error in variable assignment
  [Fix #419] Rewrite module gpg-agent; rename it to gpg
  [Fix #52] Add zstyles to configure history-substring-search
  [#52] Add zstyles to configure syntax-highlighting
  Set WORDCHARS in the editor module
  [Fix #422] Revert "Remove no longer necessary key bindings"
  Update external history-substring-search
  Sort Git conflict aliases

Conflicts:
	modules/history-substring-search/external