Update for the new distinction between linear and nonlinear cone
Merge branch 'develop' of https://github.com/johanlofberg/YALMIP into develop