Merge remote-tracking branch 'origin/master' into split-cli

Noah's config_changes parameter needed to be ported to main.py

letsencrypt/cli.py

@@ -571,7 +571,6 @@ def renew(config, unused_plugins):
     else:
         logger.debug("no renewal failures")
 
-
 def read_file(filename, mode="rb"):
     """Returns the given file's contents.
 
@@ -1118,6 +1117,10 @@ def _create_subparsers(helpful):
     helpful.add_group("revoke", description="Options for revocation of certs")
     helpful.add_group("rollback", description="Options for reverting config changes")
     helpful.add_group("plugins", description="Plugin options")
+    helpful.add_group("config_changes",
+                      description="Options for showing a history of config changes")
+    helpful.add("config_changes", "--num", type=int,
+                help="How many past revisions you want to be displayed")
     helpful.add(
         None, "--user-agent", default=None,
         help="Set a custom user agent string for the client. User agent strings allow "