Merging venice code into voldemort repo

This is being done into the voldemort/venice branch.