move docopt to requirements.txt, extend git work'