Update Amazon instance flavors
Fix syntax issue
Fix syntax issue
Correct another syntax issue
Add cpu_speed to flavors
Revert excon version back
This reverts our local modifications to fog gem

Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/fog/aws/models/compute/flavors.rb
add option :joyent_keydata.  This allows the key to be read from a file outside of Fog and be passed into the initializer.  This way the key data can be stored in something other than a file and still be used.
Basic analytics support including a class for joyent 'modules'.  Note that these are named 'JoyentModule' instead of 'Module' to avoid obvious namespace problems.
describe analytics support
add support for 'metrics'
metrics and fields
fields
add 'types'
more types
add transformations
transformations
memoize describe analytics call.  It doesn't change much and this prevents another api call for each of the objects returned by it.
add support for getting 'instrumentations'
create instrumentations, handle errors better, get an individual instrumentation