fixed promotions for addition
Merge branch 'refactor' of https://github.com/cvxgrp/Convex.jl into refactor