changed from scalars to blocks for matrix stuffing
Merge branch 'master' of https://github.com/cvxgrp/cvxpy