Add version flag to allow forcing version when autodetection fails

This hopefully shouldn't happen, but I've found a few where it does and am trying to reproduce failures a bit more reliably.