v40

Fixed cadquery package requirement.

Reverted the geometry generation that was compensating for the wrong
cadquery version.  Uncertain why the versions were dramatically
different, will have to watch carefully on new releases or considering
switching environment to a specific version of cadquery instead of
"master".