Revert "Merge branch 'master' of git://github.com/couchbase/couchbase-python-client"

This reverts commit 45959676281193e5dded7cc7a0c3f91fd64df793, reversing
changes made to a6ec0a5264e042c2b4bed8a0305ac7fe00856f70.