Add git-flow completion
Source tree diff merge tool setup