refactored constraints and added max_card constraint
Merge branch 'master' of github.com:cvxgrp/cvxpy