Maintenance update

Trying to get content into swcarpentry:master.