Merge pull request #8 from zenoss/develop

Provides support for custom metrics that have more then one index key.
Update setup.py
Merge branch 'release/2.1.0'

Conflicts:
	setup.py
Added EC2Reservation, EC2ElasticIP and EC2Image components
Merge remote branch 'vova/master' into develop