updated cvxopt.h
Merge branch 'master' of https://github.com/ifa-ethz/ecos