it's easy to overlook map/reduce merge issues. seems to be working now.
Merge branch 'master' of https://github.com/0xdata/h2o
Merge branch 'master' of https://github.com/0xdata/h2o