Made suggested changes. Exposed "mapping map" on clusterspec. Moved ec2 specific stuff to bootstraptemplate