Merge branch 'master' into rm-2.6

setup.py

@@ -32,7 +32,7 @@ setup(name='jedi',
       license='MIT',
       keywords='python completion refactoring vim',
       long_description=readme,
-      packages=find_packages(exclude=['test']),
+      packages=find_packages(exclude=['test', 'test.*']),
       python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*',
       install_requires=install_requires,
       extras_require={'dev': ['docopt']},