* Merge debian/sid branch to incorporate latest changes.
* debian/control:
  - Amend Vcs-* a bit to specify debian/sid branch as default.