adding norm_tv weights options, correcting some problems in divergence weights
Merge branch 'grad' of https://github.com/epfl-lts2/pyunlocbox into grad

Conflicts:
	pyunlocbox/functions.py