lint fixes

Conflicts:
	salt/client/__init__.py
clean out bad return