Add clamodel, modelfactory to docs

To fix #1093 and 497

I think all this is left over from a bad merge. Lines 645 and 648-660 can be safely removed.