return to using master branch for docopt
Merge branch 'master' of github.com:marcusklaas/backbonzo