Adding ConEmu support to zsh key bindings
Updated mintty config
Adding Semantic Merge support for git