improve version extraction from git

* Only extract the version from Git when the top level directory of the Git
  repository coincides with the root directory of the Kwant distribution

* Disregard tags on branches that were merged-in (with Git >= 1.8.4).