Pylint suggested improvements.
Merge pull request #15 from tomgalloway/feature/pylint_improvements

Pylint suggested improvements.
Pylint suggested improvements.
Merge remote-tracking branch 'upstream/master' into develop
Merge remote-tracking branch 'origin/develop' into feature/move_to_twisted_matrix_servers

Conflicts:
	src/santiago.py