Changed default sampling from with replacement to without replacement, and added
--with_replacement option to restore previous behaviour.
Merge branch 'master' of https://github.com/jrandall/bhaps
Merge pull request #1 from jrandall/master

pull from jrandall:master