tweaks, test got npe on 8 x m2.4xlarge ec2
will see if repeats
Merge branch 'master' of https://github.com/0xdata/h2o