Merge branch 'sample-recomb' into staging
Merge branch 'sample-recomb' into staging
implement set times from file
Merge branch 'mjh-simple' into staging
move quote_arg to a parsing file
Merge branch 'mjh-simple' into staging
add split on one char
Merge branch 'mjh-simple' into staging
add large sampling test
fix self assignments
Merge branch 'staging'
Merge branch 'master' into phasing

Conflicts:
	src/arg-sample.cpp
	src/model.h