Re-attach reviewed hitory

I have merged the cleaned-up commit made on May 12<sup>th</sup> on top of the commits that were originally reviewed for publishing on Github. Please let me know if there are any issues with this, as I can easily just force-push back over this.