Use a more sensible versioning scheme

We maintain our own changes outside of the upstream
so we need a way to indicate when our version has
increased without affecting tracking of upstream

This works for that