Updated version, Multi-provider machine caching

Caching works for multiple providers as long as the 'identifier' of the
provider is set to a unique value.

	modified:   rtwo/driver.py
	modified:   rtwo/machine.py
	modified:   rtwo/provider.py
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/rtwo