Adds support for git branch divergence syntax
Merge pull request #168 from torbjornvatn/master

Adds support for git branch divergence syntax
Merge remote-tracking branch 'upstream/master'