Remove +vcs|enable-smerge-mode-maybe, as this is already automatically enabled when current file is has merge conflicts. Moved +hydra-smerge to autoloads file, and add it to smerge-mode-hook.
Reorganize vcs functionality. Moves the custom fringe bitmaps into :ui vc-gutter.