diff --git a/.gitignore b/.gitignore
index 02316f3..f4a4b65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 *.log
 *.trs
 *.suo
+*.pyc
 *.cache
 *.user
 *.ipch
@@ -210,8 +211,6 @@
 /test/log/
 /test/test.log
 /test/py.twisted/_trial_temp/
-/test/py.twisted/test_suite.pyc
-/test/py.tornado/*.pyc
 /test/rb/Gemfile.lock
 /tutorial/cpp/TutorialClient
 /tutorial/cpp/TutorialServer
diff --git a/lib/py/setup.cfg b/lib/py/setup.cfg
index 2dca2f8..c6dab40 100644
--- a/lib/py/setup.cfg
+++ b/lib/py/setup.cfg
@@ -1,2 +1,4 @@
 [install]
 optimize = 1
+[metadata]
+description-file = README.md
diff --git a/lib/py/setup.py b/lib/py/setup.py
index 76a3526..bd177b3 100644
--- a/lib/py/setup.py
+++ b/lib/py/setup.py
@@ -28,6 +28,11 @@
 from distutils.command.build_ext import build_ext
 from distutils.errors import CCompilerError, DistutilsExecError, DistutilsPlatformError
 
+# Fix to build sdist under vagrant
+import os
+if 'vagrant' in str(os.environ):
+    del os.link
+
 include_dirs = []
 if sys.platform == 'win32':
     include_dirs.append('compat/win32')