local preprocessed
merging
Merge https://github.com/stymy/group_analysis

Conflicts:
	bootstrap.py
	group_analysis.py
	group_spat_corr.py
	output_image.py
	permutate.py