oops, make weave usage output match the command
Merge remote-tracking branch 'upstream/master' into 11_http_interface

Conflicts:
	weaver/weave