Big pull, reflecting the addition of changes to the class structure in `neotoma`

[SimonGoring]

Changing the classes led to some untested bugs. I think at this point we've fixed them all, and fixed issue #110.