move to new-style traviconda
fix traviconda setup command
Merge remote-tracking branch 'upstream/master' into mmb