fix bugs with promotions not working in julia 0.2
Merge branch 'master' of github.com:cvxgrp/CVX.jl

Conflicts:
  src/expressions/expressions.jl