Minor update for cvs2fossil

There is another snapshot of cvs2fossil. This snapshot fixes two small issues:

  1. Though most of the support for "commitid" was in place, I had forgotten to add it to the actual keyword list.
  2. The error message if a file was both in the Attic and outside was a bit mysterious, so it now detects this explicitly.