Merge pull request #1 from p2t2/DEV2.1

Dev2.1
Lazy factored inference v1
Lazy factored inference attempt 2
Lazy factored inference
Merge pull request #90 from apfeffer/DEV2.1

Dev2.1