Merging some R changes
Merge branch 'master' of https://github.com/0xdata/h2o

Conflicts:
	R/h2oRClient-package/R/Algorithms.R