Adding client kv to indexing and client
Fixes based on james' comments
Merge pull request #706 from jyates/client-keyvalue-internal

Adding client kv to indexing and client