Test volumes / zones
Add more info to volume responses
Merge remote-tracking branch 'origin/master' into generic-describers

* origin/master:
  Add more info to volume responses
  Test volumes / zones

Conflicts:
	ec2stack/providers/cloudstack/zones.py
Fix merge descriptancies