pylint fixes
zope.interface
display: width and height instance variables
Remove SingletonD
Merge branch 'display-refactor' into zope.interface-display
IDisplay
display using ZCA
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
Merge branch 'master' into zope.interface

Conflicts:
	letsencrypt/client/augeas_configurator.py
	letsencrypt/client/interfaces.py
Merge branch 'master' into zope.interface

Conflicts:
	letsencrypt/client/recovery_token_challenge.py
Merge branch 'zope.interface' into zope.interface-display

Conflicts:
	letsencrypt/client/client.py
	letsencrypt/scripts/main.py
Merge pull request #133 from kuba/zope.interface

zope.interface
Merge branch 'zope.interface-display' of git://github.com/kuba/lets-encrypt-preview into kuba-zope.interface-display
Make necessary fixes to pull request
git push origin masterMerge branch 'kuba-zope.interface-display'
Remove nginx_configurator from master