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
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