bug fixes
Merge branch 'composite-partitioning' of https://github.com/rytaft/h-store into composite-partitioning