Merge changes

I've updated the merge request you made to actually make the PDF accessible via a download, and merged the differences in our two versions of the file. You'll have to pull again to get the 8 new commits.