Merge branch 'master' of github.com:kennethreitz/pipenv

# Conflicts:
#	setup.py

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

README.rst

@@ -34,8 +34,17 @@ The problems that Pipenv seeks to solve are multi-faceted:
 - Managing a ``requirements.txt`` file `can be problematic <https://www.kennethreitz.org/essays/a-better-pip-workflow>`_, so Pipenv uses the upcoming ``Pipfile`` and ``Pipfile.lock`` instead, which is superior for basic use cases. 
 
 
-User Testimonials
------------------
+Installation
+------------
+
+::
+
+    $ pip install pipenv
+
+✨🍰✨
+
+☤ User Testimonials
+-------------------
 
 **Jannis Leidel**, former pip maintainer—
     *Pipenv is the porcelain I always wanted built for pip. It fits my brain and mostly replaces virtualenvwrapper and manual pip calls for me. Use it.*
@@ -186,16 +195,6 @@ Magic shell completions are now enabled!
 
 
 
-☤ Installation
---------------
-
-::
-
-    $ pip install pipenv
-
-✨🍰✨
-
-
 ☤ Documentation
 ---------------
 

docs/index.rst

@@ -32,6 +32,17 @@ It automatically creates and manages a virtualenv for your projects, as well as
 
 .. image:: http://media.kennethreitz.com.s3.amazonaws.com/pipenv.gif
 
+Install Pipenv Today!
+---------------------
+
+::
+
+    $ pip install pipenv
+    ✨🍰✨
+    
+If you have excellent taste, there's also a  `fancy installation method <http://docs.pipenv.org/en/latest/advanced.html#fancy-installation-of-pipenv>`_.
+
+
 User Testimonials
 -----------------
 

setup.py

@@ -5,7 +5,7 @@ import codecs
 import os
 import sys
 
-from setuptools import setup
+from setuptools import find_packages, setup
 
 here = os.path.abspath(os.path.dirname(__file__))
 
@@ -55,9 +55,7 @@ setup(
     author='Kenneth Reitz',
     author_email='me@kennethreitz.org',
     url='https://github.com/kennethreitz/pipenv',
-    packages=[
-        'pipenv', 'pipenv.vendor',
-        'pipenv.vendor.pipfile'],
+    packages=find_packages(exclude=('tests',)),
     entry_points={
         'console_scripts': ['pipenv=pipenv:cli'],
     },