changed ScaledCost class to a helper function
add SML (PCD) and CD-k for RBMs
Merge remote-tracking branch 'upstream/master'
changed ScaledCost to scaled_cost
fixed indentation in ScaledCost
fixed bugs and typos in SML and CD-k
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pylearn2/costs/cost.py
	pylearn2/costs/ebm_estimation.py
fixed a bug (type stride_stride)
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 remote-tracking branch 'upstream/master'
Adapted SML and CDk to new interface
Merge remote-tracking branch 'upstream/master'
fixed misnamed tensor
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'