fixed elastic controller to get global params
fixing zipfian scrambled
Merge branch 'partitioning-planner' of https://github.com/rytaft/h-store into partitioning-planner
fixing up zipfian generator for ycsb
adding generator for varying zipfian skew
fixed varying zipfian
adding features to zipfian generator
Merge branch 'partitioning-planner' of https://github.com/rytaft/h-store into partitioning-planner

Conflicts:
	build.xml
	src/frontend/org/qcri/PartitioningPlanner/Controller.java