Lint fixes
Merge branch 'lint' of git://github.com/terminalmage/salt into terminalmage-lint

Conflicts:
	salt/daemons/test/test_master.py
	salt/daemons/test/test_minion.py