Merge pull request #151 from Atreyee/master

Fixed minor bug in compilation of EE with debug log enabled.
make gcc 4.8.* happy
Merged from upstream https://github.com/apavlo/h-store.git. Fixed merge conflicts