Add missing changes from last merge.

Git flow extensions, checkout main branches.
Remove unused stuff.