Use upstream-tag instead of upstream-branch in gbp.conf

This should address #211 if we can prove that it is safe to change.

Do not merge until the commit which changes the version in the `setup.py` is dropped from this pull request.