Consolidate new-version branch with release

[zkamvar]

There are two branches that are ahead of master, new-version and release. It is confusing why both of these should be ahead of master. When comparing these, it appears that release may be slightly ahead of new-version and should be favored: https://github.com/annecori/EpiEstim/compare/new-version..release

[zkamvar]

Scratch that, and reverse it. New version appears to have one more feature from 7680cea

[jstockwin]

Hey @zkamvar, apologies for the confusion. We're aware of this and will try to get around to resolving it as soon as possible!

The plan is to get both branches merged in to master!

[annecori]

FYI I think release was something we did because @thibautjombart wanted a version to use in the field in an Ebola outbreak (last year or the one before).
Are we happy with this and can we close this issue? @jstockwin and @zkamvar ?

[jstockwin]

Yep, this can definitely be closed!

[zkamvar]

Agreed.

I believe the original idea behind the release branch was @richfitz. This was so that you could point the deployer to that branch and easily point people to the last known working version. The only problem was that it required you to actually push to the release branch every time you made a release.

[jstockwin]

Now that we have proper releases this isn't a problem, though? You can just target EpiEstim@v2.1-0.

[zkamvar]

No, it isn't really a problem at all... It's just that someone needs to be on top of it in the future.