fixed bug where redundant constraints removed after contributing to matrix dimensions
Merge branch 'master' of https://github.com/cvxgrp/cvxpy