ENH: updated cli
FIX: build
Merge branch 'master' of github.com:Binstar/binstar_client