vimrc: shortcut to find git merge in file
zsh: xflux handling

    + Some minor features