Deleted rewrite branch and hand merge to master

No need for the rewrite branch, the code base is tiny. I deleted that
and hand merged all the files to master.