Code cleanup
Merge branch 'master' of github.com:henrysher/yum-s3-tools

Conflicts:
	s3yum/s3iam.py
Merged from last commit