update changelog
add Trent's request
create separate function for touching .nonadmin file when necessary
Merge branch 'master' of github.com:ContinuumIO/conda into pypi-install
Merge pull request #327 from ContinuumIO/pypi-install

Add the features of pypi-install branch to conda.
Add changelog additions for pypi-install branch merge.
Add a link to the documentation to the README

Fixes #330.
Revert "Merge pull request #327 from ContinuumIO/pypi-install"

This reverts commit 57eaac63d41ede5b8e7527cf32c0aa564400c89d, reversing
changes made to 84ca3b6542ef15ffe2c980fc15f04e9d91da6edc.
Revert "Add changelog additions for pypi-install branch merge."

This reverts commit f51609bc70aa23ccb1962d583eacc5516771ee7d.
Merge pull request #335 from ContinuumIO/revert_pypi_pull

Revert the pull request that merged pypi-install
add the new hidden .nonadmin file
fix creation of directories
fix open mode
update changelog
New fixes to conda for better integration with pip and pypi
Remove unused function.
Don't try to install pip with pip...
handle uncaught exception in conda list
remove sys.prefix workaround (not that the problem has been fixed in Python itself)
remove unused imports and cleanup