Make it clear that locks are directories
Merge branch 'master' of github.com:ContinuumIO/conda