iImprovements
Merge branch 'master' of https://github.com/0xdata/h2o

Conflicts:
	py/ec2_cmd.py