Switch to bbdiff for difftool and mergetool

Added git_config() helper method for setting config values