Fixing my borked merge on riak_search_client
Fixing my borked merge on riak_search_client

basho/riak_search,xuejianhai/riak_search,wwezhuimeng/riak_search,basho/riak_search,wwezhuimeng/riak_search,xuejianhai/riak_search