make gcc 4.8.* happy
Merge branch 'master' of https://github.com/apavlo/h-store into split-planner
Merge branch 'split-planner' of ssh://github.com/marcoserafini/h-store into split-planner
Merge branch 'split-planner' of ssh://github.com/marcoserafini/h-store into split-planner