Fixed more bugs in observation matching
Merge branch 'master' of https://github.com/whitead/ForcePy into energy_out