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