Progress on EM
New implementation of type inference
Merged conflict
Removed current type info
Fixed conflict in EM
removed ill-typed trace
Fixed bug in EM
Fixed frontier sampling, EM complete but untested
Changed calculation of expression probability so that it marginalizes over the derivation
Fixed bugs in EM
Merge branch 'alternative_approach' of https://github.com/edechter/strappy into alternative_approach