Properly recover from bad (old?) Marshal files
Reverted in-git version to "[git]"

Other version numbers should only be set for actually-released versions