Merge branch 'jn/cli'

--block-list was added in the 5.1.2alpha release because someone
needed it, but the implementation and interface are not finished so
it's best in Debian to leave it out.

Thanks to Lasse Collin for advice.

* jn/cli:
  Remove support for --block-list