Two fixes and cleanup.

Removed duplicate __contains__() in DocumentMetaWrapper. Fixes for
issues #13 and #15