minor fixes + imported riak_client from a fork where some patches have been applied