If something goes wrong with EC2Service, also destroy the registered AMI, if it exists
Rewrite a comment
Limit image uploads to the arch/build combos we're interested in