"Rebase" the eecworld branch

So the commit trail will be a mess....

Oh well!  The price for trying to use just github to do all of this.