merge zodb branch into alpha 0.5

We ready to do this @mwatts15 ?