Change print statements to log statements
Merge branch 'pylint_fixes' of https://github.com/rallytime/salt into rallytime-pylint_fixes

Conflicts:
	salt/crypt.py
Merge branch 'rallytime-pylint_fixes' into develop