Ensure that delvol_on_destroy is done for all created volumes
Extend the commands to have this option for specific volumes
Fix typo in comment
Cleanup some code
Split out the options for root volume and others
Merge branch 'develop' into delvol
Merge branch 'delvol' of github.com:mahendra/salt-cloud into delvol
Raise a salt cloud exit exception if we just deploying a single VM.
Merge pull request #761 from s0undt3ch/develop

Raise a salt cloud exit exception if we just deploying a single VM.
Merge branch 'develop' into delvol

Conflicts:
	saltcloud/clouds/ec2.py
Merge remote-tracking branch 'upstream/develop' into delvol
Merge pull request #718 from mahendra/delvol

Ensure that all volumes created during init follow delvol_on_destroy
ec2: when listing nodes, extract location from current provider
Add show_delvol_on_destroy and other bug fixes
Merge pull request #764 from mafrosis/provider-locations

EC2: when listing nodes, extract location from current provider
Merge pull request #765 from mahendra/delvol

Add show_delvol_on_destroy and other bug fixes