Drop UserFactor and migrate back to CheetahFactor
Merge pull request #119 from chcculle/drop-user-factor

Drop UserFactor and migrate back to CheetahFactor