Change version numbering scheme to better match our releases