Adds conda recipe dist/conda/
Merge branch 'deployment/v2.1' into 'master'