recent from Becca
Merge branch 'partitioning-planner' of https://github.com/rytaft/h-store into partitioning-planner

Conflicts:
	properties/benchmarks/ycsb.properties
Recent code from Becca 26 Jan
test
test
Tuple Tracking with multi partitions per site
Tuple Tracking with multi partitions per site