bb gh merge



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

    
btw if you don't like classes so much, take a look at `py.test` ;-)