made cvxopt default for all non-SOCPs
Merge branch 'master' of github.com:cvxgrp/cvxpy