Merge pull request #123 from bxparks/develop

merge 2.4.0 into master

Merge pull request #121 from bxparks/develop

merge 2.3.2 into master

Merge pull request #117 from bxparks/develop

merge 2.3.1 into master

Merge pull request #115 from bxparks/develop

merge 2.3.0 into master

Merge pull request #113 from bxparks/develop

merge 2.2.3 into master

Split test data into transitions and samples

Merge pull request #112 from bxparks/develop

merge 2.2.2 into master