cleaned up imports
Merge branch 'master' of github.com:cvxgrp/cvxpy