[issues/9] Updating entities to reflect 4.0 changes

[mmerrell]

I'd still like to include more examples in the ChangeLog--there were some fairly big changes here. If I get time I will do it, but I might just ship 0.9 as-is and add the examples to be posted here