Updated CVX Shim to work with version 2.0, build >945.
Merged modifications by Eric

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