Bump patch version and slight reorg of versioning code.

Bump patch version due to @lziest's latest commit.