setting up wpcross for bootstrap cov matrices
fixed merge.
Merge branch 'master' of https://github.com/bareid/LSSanalysis

Conflicts:
	wp.py