Removed madeleine's old code. Added support for promoting scalars to
vectors/matrices as needed during addition and multiplication. Changed +
and * atoms to have special cases for constants. Cleaned up some of the
logic involved in promoting size during + and *.
Merge branch 'master' of https://github.com/karanveerm/CVX.jl

Conflicts:
	src/expressions/expressions.jl