Merge branch 'master' of git://github.com/lisa-lab/pylearn2
Rename LxReg to LpNorm to be more consistent with the litterature
Add unit test for LpNorm
Add more code to LpNorm unit tests
Add necessary things for unit tests to work
Changes to test_lp_norm_cost.py
Merge branch 'lxreg' of github.com:vdumoulin/pylearn2 into lxreg

Conflicts:
	pylearn2/costs/cost.py
	pylearn2/utils/iteration.py
Simplify LpPenalty unit test