pylint fixes
Merge branch 'master' into pep8

Conflicts:
	letsencrypt/client/apache/configurator.py
	letsencrypt/client/client.py
	letsencrypt/client/tests/apache_configurator_test.py
Merge pull request #132 from kuba/pep8

pylint fixes