removed a pass over scores array
updated readme to remove niter arg to resample()
Merge branch 'master' into dev
declare sample_discrete inline, whitespace, tweaks