Make ~/.conda/envs the first user envs dir

It still searches ~/envs for backwards compatibility.
Merge branch 'master' of github.com:conda/conda