Was done by copying files, rather than a merge. This nuked the commit history.
This is a readme, please update accordingly.
