updates
Merge branch 'squall-experiments' of https://github.com/rytaft/h-store into squall-experiments