Cm 10.1

We will need to handle the pregenerated config.h that we use in the CM build. Obviously don't want that checked in as is.