Minor changes.
Merge branch 'master' of https://github.com/mattbellis/3pcf

Conflicts:
	src/3pcf_Bellis_naive.cu
Tried to cache some of the calculations.