* clean up activate and deactivate scripts, moving back to conda repo, 1727,
2265, 2291, 2473, 2501, 2484
* replace pyyaml with ruamel_yaml, 2283, 2321
* better handling of channel collisions, 2323, 2369 2402, 2428
* improve listing of pip packages with conda list, 2275
* re-license progressbar under BSD 3-clause, 2334
* reduce the amount of extraneous info in hints, 2261
* add --shortcuts option to install shortcuts on windows, 2623
* skip binary replacement on windows, 2630
* don't show channel urls by default in conda list, 2282
* package resolution and solver tweaks, 2443, 2475, 2480
* improved version & build matching, 2442, 2488
* print progress to the terminal rather than stdout, 2281
* verify version specs given on command line are valid, 2246
* fix for try_write function in case of odd permissions, 2301
* fix a conda search --spec error, 2343
* update User-Agent for conda connections, 2347
* remove some dead code paths, 2338, 2374
* fixes a thread safety issue with http requests, 2377, 2383
* manage BeeGFS hard-links non-POSIX configuration, 2355
* prevent version downgrades during removes, 2394
* fix conda info --json, 2445
* truncate shebangs over 127 characters using /usr/bin/env, 2479
* extract packages to a temporary directory then rename, 2425, 2483
* fix help in install, 2460
* fix re-install bug when sha1 differs, 2507
* fix a bug with file deletion, 2499
* disable .netrc files, 2514
* dont fetch index on remove --all, 2553
* allow track_features to be a string *or* a list in .condarc, 2541
* fix 2415 infinite recursion in invalid_chains, 2566
* allow channel_alias to be different than binstar, 2564