Update to upstream version 2.2.1

This updates the debian package to upstream version 2.2.1 - mostly by merging the launchpad branch.

Also see my pristine-tar pull request which is needed so that git-buildpackage continues to work - it seems it was confused by the change of the compression format.