fix bug that prevented setting custom params for cvxopt
Merge branch 'expr_tree' of https://github.com/bodono/cvxpy into expr_tree