Resampling observed states when a state has not yet been omitted no longer crashes
Merged from remote
Merge branch 'master' into bic_scan

Conflicts:
	basic/pybasicbayes
fixed conflict stuff