ENH: Implement the proximal_convex_conj in a more general way.
ENH: Implement the proximal_convex_conj in a more general way.

Failures are due to Issue #1219.
Minor style fixes.

aringh/odl,aringh/odl,odlgroup/odl,odlgroup/odl,kohr-h/odl,kohr-h/odl