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 remote-tracking branch 'upstream/master'
Adapted SML and CDk to new interface
Merge remote-tracking branch 'upstream/master'
fixed misnamed tensor
fixed comments; default value of pos_mf_steps set to 50 in estimate_likelihood
the number of test samples does not have to be the exact multiple of batch_size
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fixed typo in ebm_estimation
Merge branch 'master' of https://github.com/bouthilx/pylearn2
Changed OrderedDict import
Changed if 0: syntax