typos in constraints.jl
Merge branch 'dev' of https://github.com/cvxgrp/CVX.jl into refactor
Merge branch 'refactor' of https://github.com/cvxgrp/CVX.jl into refactor

Conflicts:
	src/problems/conicproblem.jl
added dual_conic_form for refactor