Removed zope.container dependency and cleaned up everything for a next
release. All tox tests pass.