Add difftool for git; rework bash aliases

Make use of the "vcs_mergetool" command for the git mergetool, which can
be configured on a per-system basis via the VCS_MERGETOOL variable. Also
reworked some cd-aliases for consistency