Merge branch 'master' into jobs
Comment out KMeans2 for now.
Merge branch 'jobs' of github.com:0xdata/h2o into jobs

Conflicts:
	src/main/java/water/api/DocGen.java