Merge pull request #32 from mcg1969/master

cvx_ecos.m: eliminate dependence on cvx_version