@pingou I combined the merge and release in one PR in the interest of time, hope that's OK. If you want me to split them just shout.

@scoady, @pingou and I (well pingou did the work, I just merged a few PRs) cleaned up the repos, updated tests, and the readme. Can you rebase?

It'd probably be easier to split the merge and release separately (and go from develop->master->staging->productions)

Ideally, I'd like to get a fix for #73 in before we do another release, despite the fact that I've nearly entirely ignored this repo for the last year :-(

The original idea for staging and production was to rebase them on the top of develop or master when we want to update the version running in openshift (ie: no merge commits)

@pingou yeah - I noticed when I made this patch that the process you just outlined hadn't really been followed so the branches were out of step. What I can do then is bring develop and master in line with each other and then also rebase staging. I'll create a separate PR for each and the only one I'll bump the version on is prod.

@bcotton no problem, it's up to you the order and if you want to wait, but just FYI elections isn't fully working in prod at the moment as you can't log in without this fix.

I'll close this and create all the PRs now to do the above anyway.

Actually, I just read the readme properly and it says to use force pushing so someone with access will need to do that - this was the complete wrong approach to getting a release. Develop is up to date so a merge on master and then a force push to staging and then prod in turn is whats needed. Closing this now.