Test that no stderr is produced with captured()
Add test for automatic grabbing of build number
Merge branch 'master' of github.com:conda/conda