ec2 script changes for spark 1.2.0
allow specifying cluter spark version in ec2 script; some PEP changes
Fixed minor conflicts
Merge branch 'industrial-sloth-ec2_spark120'