Merge and delete the short version repo

My understanding is that the "short" repo will just end up being the new version of the code-publishing repo in which case we should:

1. Merge the "short" repo when it is finished (which should be easy enough since it's a fork of this repo)
2. Delete the "short" repo because it will then be redundant