Merge branch 'dev' of https://github.com/cvxgrp/CVX.jl
pretty printing
Cleanup display.jl, add show functions for Solution and CanonicalConstr
merged prettyprint
merged prettyrprint