fix counter_name -> meter_name
fix resource type Metering -> Ceilometer
Account for Heat's better handling of tags
Update image names