Updates

Update hadoop version, build version, and a bug fix (filed upstream, too).

cc @danielmcgrath @bennettandrews