Merge pull request #669 from hnyman/git-branch