bb gh merge



Pull request for [bb gh merge](https://trello.com/c/pkU0gunr/1807-bb-gh-merge).

    
Great point, thanks for catching. 

I always forget about the other ways git can be (mis)configured