mapped 2 to fro and added spec as norm option
Merge branch 'master' of github.com:cvxgrp/cvxpy