PEP8 fixes
Other minor fixes
Merge branch 'master' of github.com:globocom/simple-swiftclient

Conflicts:
	simple_swiftclient/shell.pyc