Docs fixes
diff --git a/MANIFEST.in b/MANIFEST.in
index bea6fd9bb46..3bd657b8781 100644
--- a/MANIFEST.in
+++ b/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
diff --git a/letsencrypt/acme/jose/jws.py b/letsencrypt/acme/jose/jws.py
index 81106dd2c3d..3b962aede46 100644
--- a/letsencrypt/acme/jose/jws.py
+++ b/letsencrypt/acme/jose/jws.py
@@ -3,7 +3,7 @@
 import base64
 import sys
 
-import M2Crypto.X509
+import M2Crypto
 
 from letsencrypt.acme.jose import b64
 from letsencrypt.acme.jose import errors
diff --git a/letsencrypt/acme/jose/jws_test.py b/letsencrypt/acme/jose/jws_test.py
index 6e6b51350f3..215960e1589 100644
--- a/letsencrypt/acme/jose/jws_test.py
+++ b/letsencrypt/acme/jose/jws_test.py
@@ -5,7 +5,7 @@
 import unittest
 
 import Crypto.PublicKey.RSA
-import M2Crypto.X509
+import M2Crypto
 import mock
 
 from letsencrypt.acme.jose import b64
diff --git a/letsencrypt/client/apache/configurator.py b/letsencrypt/client/apache/configurator.py
index 93db689f8ea..89a2ff4e2df 100644
--- a/letsencrypt/client/apache/configurator.py
+++ b/letsencrypt/client/apache/configurator.py
@@ -548,8 +548,9 @@ def enhance(self, domain, enhancement, options=None):
     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
