1) Upgrade to kamaki v0.10rc2 2) combine hadoop_cluster.py with hadoop.yml