Fixed an issue that flattened a multi-line custom prompt into a single line, and cleaned up the prompt prefixing behavior
Indent code for majver == 3 and minver >= 4 and add '_collections_abc' as
required module, needed as of Python 3.4.0a4
document that --extra-search-dir is working again
have the metavar be singular to match the option
Merge pull request #489 from msabramo/fix_python34a4

Indent code for majver == 3 and minver >= 4 and add '_collections_abc' as  required module, needed as of Python 3.4.0a4
use default theme, so we can evolve with RTD's design efforts.
Merge pull request #498 from pypa/docs_rtd

use default theme, so we can evolve with RTD's design efforts.
remove old docs theme files
use default theme, so we can evolve with RTD's design efforts.
remove old docs theme files
better detection of docs theme
clearer indication of which options are DEPRECATED
Merge pull request #499 from qwcode/cli_deprecation

clearer indication of which options are DEPRECATED
Merge pull request #353 from ryanartecona/develop

Cleaner fish prompt-switching behavior
Update activate.fish

replaced . bin/activate.fish with source bin/activate.fish, because of this:
marcel@marcel ~> .
source: '.' command is deprecated, and doesn't work with STDIN anymore. Did you mean 'source' or './'?
(1) marcel@marcel ~>
Merge pull request #501 from punkkeks/patch-1

remove deprecated function in activate.fish
Update setuptools
Merge pull request #502 from pypa/update-setuptools

Update setuptools
bump development version
Include pip 1.5rc1