Add --json to --help output
Merge branch 'master' of github.com:conda/conda
record all created environments in ~/.conda/environments.txt
Merge remote-tracking branch 'conda/master' into feature/switch-to-entry-points
Not sure why I did getattr, but its not necessary