added __contains__
version bump
merged source trees, fixed tox testing, version bump