Merge pull request #2 from p2t2/DEV2.2

Dev2.2
Importance sampling implements likelihood weighting
Merge pull request #173 from apfeffer/DEV2.2

Dev2.2