Kelly-Markowitz updates
Merge branch 'cvxopt-tinkering'