Adding cinder support
Merge branch 'master' of github.com:ssbanerje/SimianArmy

Conflicts:
	src/main/java/com/netflix/simianarmy/client/openstack/OpenstackClient.java