added clamodel to doxs
added modelfactory to doxygen fixes 1093
fixing merge conflicts with my doc patch
Update clamodel.py

Fix bad merge.
Corrected path
Merge pull request #1095 from evelynmitchell/master

Add clamodel, modelfactory to docs