Modify setupgit.sh to test presence of git-flow by calling 'git flow
version' instead of 'which git-flow' as git-flow may not be on the path.
Merge branch 'feature/fix-setupgit' into develop