add separate module for connection support
deprecate conda pip
add more description to conda build command
update changelog
Add locking to conda
Merge branch 'master' of github.com:ContinuumIO/conda
update ignore files
update changelog
fix scripts to work on Windows when spaces are in the file name
Generalize the confirm function a little bit

Now it can confirm with any message and any set of options.  The default y/n
is now called confirm_yn.

Use this to give a more helpful message in conda pip when the package is
already in conda (#120).
Merge branch 'master' of github.com:ContinuumIO/conda
Show the invalid choice
Fix spelling
Don't pip install if the user chooses conda
Document conda remove --features
The "lockfile" is not really a file
add PREFIX to actions being created
avoid duplicate code by creating action plan, this has also the advantage that the normal install events are transmitted
Use better method to determine if activate and deactivate are being sourced

See http://stackoverflow.com/a/2684300/161801
source activate and source deactivate return non-zero on failure