Run 2to3
remove bak files
Escape unicode character in unicode string
Fix UserDict
Fix rfc822
Fix b64 encode issue
Default decoder should expect utf-8
We're only testing that ascii can be encoded, not reseting the key to a
bytestring
Raise the exception in this test if it's not the one you expect
Handle more encoding issues
Merge branch 'master' of git://github.com/issackelly/riak-python-client into feature/py3k

Conflicts:
	riak/__init__.py
	riak/benchmark.py
	riak/bucket.py
	riak/client/multiget.py
	riak/client/operations.py
	riak/multidict.py
	riak/riak_object.py
	riak/tests/pool-grinder.py
	riak/tests/test_all.py
	riak/tests/test_yokozuna.py
	riak/transports/http/__init__.py
	riak/transports/http/codec.py
	riak/transports/http/connection.py
	riak/transports/http/stream.py
	riak/transports/http/transport.py
	riak/transports/pbc/connection.py
	riak/transports/pbc/transport.py
	riak/transports/pool.py
	riak/transports/transport.py