Merge pull request #312 from kuba/docs

Docs fixes

MANIFEST.in

@@ -1,6 +1,6 @@
 include README.rst
 include CHANGES.rst
-include CONTRIBUTING.rst
+include CONTRIBUTING.md
 include linter_plugin.py
 include letsencrypt/EULA
 recursive-include letsencrypt *.json

letsencrypt/acme/jose/jws.py

@@ -3,7 +3,7 @@ import argparse
 import base64
 import sys
 
-import M2Crypto.X509
+import M2Crypto
 
 from letsencrypt.acme.jose import b64
 from letsencrypt.acme.jose import errors

letsencrypt/acme/jose/jws_test.py

@@ -5,7 +5,7 @@ import pkg_resources
 import unittest
 
 import Crypto.PublicKey.RSA
-import M2Crypto.X509
+import M2Crypto
 import mock
 
 from letsencrypt.acme.jose import b64

letsencrypt/client/apache/configurator.py

@@ -548,8 +548,9 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
     def _enable_redirect(self, ssl_vhost, unused_options):
         """Redirect all equivalent HTTP traffic to ssl_vhost.
 
-        .. todo:: This enhancement should be rewritten and will unfortunately
-            require lots of debugging by hand.
+        .. todo:: This enhancement should be rewritten and will
+           unfortunately require lots of debugging by hand.
+
         Adds Redirect directive to the port 80 equivalent of ssl_vhost
         First the function attempts to find the vhost with equivalent
         ip addresses that serves on non-ssl ports