I've finished the merger of the two drafts of the bylaws, and the result (with links to the originals) are here:

There needs to be a bit of legal tweaking done still. There was a lot of work done on these drafts previously, and in many cases the wording was in a different order. I've tried to capture all of the difference in strikeout text, where the letter of the drafts differed in substantive ways.

I've eliminated the numbering of the sections for now, as it's the content that needs review.

I'd like to extend thanks to Ec and Greeves, the main authors of the drafts, and of course anyone who contributed to them.