Edit ms
Merge branch 'master' of github.com:seananderson/ss3sim
Revert sampling functions in master branch

Leaving the in-progress functions in the sampling-refactor branch