Merge branch 'nitools' of https://github.com/rdevon/pylearn2 into nitools

Conflicts:
	pylearn2/neuroimaging_utils/research/randomize_snps.py
Merge branch 'nitools' of https://github.com/rdevon/pylearn2 into nitools

Conflicts:
	pylearn2/neuroimaging_utils/research/randomize_snps.py