deploy: backup location change
gitconfig: merge tool set to meld