pep8 cleaning
Merge branch 'master' of github.com:slipstream/SlipStreamClient

Conflicts:
	client/src/main/python/ss-module-download
	client/src/main/python/ss-module-upload
	client/src/test/python/TestStratusLabClientCloud.py
pep8 cleaning