Get the python version fix the right way around...
Add some more tests and docs for __keys and __values.