Add with_metaclass to the compat module
Merge branch 'master' of github.com:conda/conda