Fix bad data and merge conflicts in the pricing file.
Fix bad data and merge conflicts in the pricing file.

Kami/libcloud,Kami/libcloud,andrewsomething/libcloud,apache/libcloud,apache/libcloud,mistio/libcloud,Kami/libcloud,apache/libcloud,mistio/libcloud,andrewsomething/libcloud,mistio/libcloud,andrewsomething/libcloud