'parallelism' instead of 'parallel'
Merge branch 'master' of github.com:0xdata/h2o

Conflicts:
	py/h2o.py
add some framework for checking cpu utilization. test_GBM_manyfiles_multijob.py seems to get NPE
Merge branch 'master' of github.com:0xdata/h2o