Add --long to the call to git-describe

So that we get something more useful than then name of a tag that doesn't
exist anywhere but jenkins.
Correct check for "already-PKness" on setting PK