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 link
Added EC2Reservation, EC2ElasticIP and EC2Image components
Merge remote branch 'vova/master' into develop
modeling VPN gateways, improved development infrastructure
Merge pull request #2 from ssirushchyshyn/develop

S3Bucket component
merge fix
Merge pull request #3 from ssOleg/develop

Added EC2Reservation, EC2ElasticIP and EC2Image components
fixed VPN Gateway component
forgot to add deleted files to commit
merge
Merge pull request #4 from ssbunyk/develop

VPN gateway 2
Path reporter removed
Modified relations between components
Added modeling for elastic IPs and reserved instances
Added elastic IPs and reserved instances to test utils
Merge fix