trying new version of conda
Merge branch 'master' of github.com:cvxgrp/cvxpy

* 'master' of github.com:cvxgrp/cvxpy:
  DOC: exponential -> logarithm in docstring
  MAINT: svd -> svdvals in nuclear norm implementation
  MAINT: log(det(A)) -> logdet(A)