Various fixes from thistle
Merge branch 'master' of https://github.com/rustychris/conda-recipes