merge stuff from hotfix releases into devel

This should be mostly just cherry-picks of the things that we did as hotfixes based on master to correct release and packaging issues so that devel has this stuff too. The only addition is a minor touchup to the readme.