Merge remote-tracking branch 'upstream/master'

Conflicts:
	.classpath
	.settings/org.eclipse.jdt.core.prefs
	build.sh
	py/cypof.py
	py/ec2_cmd.py
	py/h2o.py
	py/h2o_hosts.py
	py/junit.py
	py/pytest_config-Cliff Click.json
	py/test.py
	py/testdir_hosts/n0.doit
	py/testdir_hosts/n1.doit
	py/testdir_hosts/pytest_config-173-180.json
	py/testdir_hosts/pytest_config-Cliff Click.json
	py/testdir_hosts/pytest_config-cliffc.json
	py/testdir_hosts/pytest_config-cypof.json
	py/testdir_hosts/pytest_config-kevin.json
	py/testdir_hosts_bench/172.json
	py/testdir_hosts_bench/174.json
	py/testdir_hosts_bench/175.json
	py/testdir_multi_jvm/n0.doit
	py/testdir_multi_jvm/test_parse_rand_schmoo.py
	py/testdir_multi_jvm/test_parse_rand_schmoo3.py
	py/testdir_single_jvm/n0.doit
	src/main/java/water/AutoBuffer.java
	src/main/java/water/H2O.java
	src/main/java/water/Job.java
	src/main/java/water/Log.java
	src/main/java/water/store/s3/PersistS3.java
	src/main/java/water/util/Utils.java
	src/test/java/water/Sandbox.java
Merge branch 'master' of github.com:shantanusharma/h2o

Conflicts:
	py/h2o.py