taking correct sample of neighbourhood to weight with w_ij
dividing now by relative weights instead of spp

outrageous bug, sorry about that >.<
Merge branch 'master' into fast

Conflicts:
	src/sbf/RandomParameterFilter.cpp