Update docopt to fix -- option parsing

Closes #492
auto merge of #495 : alexcrichton/cargo/issue-492, r=brson

Closes #492