Use git describe --first-parent for version

This should help disambiguate branches, but still needs a new tag on
master.