First cut at condarc and proxy settings
Do not silently ignore error by pip
Merge remote-tracking branch 'upstream/master'
Call to pip should not silently ignore errors, version 2.
Added option to list of rc options, changed import to match updates in connection_handling
Don't import print_function in pypi.py
Merge branch 'master' of github.com:ContinuumIO/conda
locations is not a real thing for condarc
Fix conda build for binaries

It still needs to be tested in Python 3.
Add conda clean to the changelog
Update the changelog
Fix the conda install
Be extra careful
Removed proxy server from config options
Remove replace_bi_path

This is not needed, and it breaks Python 3 and cmake
Merge remote-tracking branch 'jacoblsmith/master'

Conflicts:
	condarc
	tests/condarc
Update changelog
Make the default Python to be Python 3 if conda is in Python 3
Fix some issues in Python 3
Reorganize command list from conda help