Fix https://github.com/basho/riak-python-client/issues/146 as stated in the
issue itself (Map/Reduce frequently throws riak.RiakError).
Merge pull request #361 from serenabiodec/master

Fix https://github.com/basho/riak-python-client/issues/146

Reviewed-by: seancribbs