Get machine images working with multiple machines

Relocated the image_spec machine options loading for all machine_options calls - this is needed for batch machine support as seen in the example ec2_images.rb


ha!  That's what you get when you do a hackday.