cosmetic fixes
Merge branch 'master' of https://github.com/Tarick/tools

Cosmetic fixes:
	ec2/setup-volume.py