Add locking to conda
Merge branch 'master' of github.com:ContinuumIO/conda