diff --git a/.pylintrc b/.pylintrc
index 92dde98c0..49d0f29ea 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -38,7 +38,7 @@ load-plugins=linter_plugin
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=fixme,locally-disabled,abstract-class-not-used,abstract-class-little-used,bad-continuation,too-few-public-methods,no-self-use,invalid-name,too-many-instance-attributes
+disable=fixme,locally-disabled,abstract-class-not-used,abstract-class-little-used,bad-continuation,too-few-public-methods,no-self-use,invalid-name,too-many-instance-attributes,cyclic-import
 # abstract-class-not-used cannot be disabled locally (at least in
 # pylint 1.4.1), same for abstract-class-little-used
 
diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py
index dee43eac1..b76311777 100644
--- a/letsencrypt/cli.py
+++ b/letsencrypt/cli.py
@@ -1,4 +1,5 @@
 """Let's Encrypt command CLI argument processing."""
+# pylint: disable=too-many-lines
 from __future__ import print_function
 import argparse
 import copy
@@ -30,7 +31,6 @@ from letsencrypt import storage
 from letsencrypt.display import ops as display_ops
 from letsencrypt.plugins import disco as plugins_disco
 
-# pylint: disable=too-many-lines
 
 logger = logging.getLogger(__name__)
 
@@ -635,7 +635,7 @@ class HelpfulArgumentParser(object):
         self.VERBS = main.VERBS
         # List of topics for which additional help can be provided
         HELP_TOPICS = ["all", "security",
-                       "paths", "automation", "testing"] + list(six.iterkeys(self.VERBS)
+                       "paths", "automation", "testing"] + list(six.iterkeys(self.VERBS))
 
         plugin_names = list(six.iterkeys(plugins))
         self.help_topics = HELP_TOPICS + plugin_names + [None]
diff --git a/letsencrypt/renew.py b/letsencrypt/renew.py
new file mode 100644
index 000000000..e69de29bb