Merging upstream changes from Software Carpentry

I just pulled in all the changes from the upstream SWC repo since I first cloned it. I had a quick scan through and in the lessons it seems to be mostly fixes to the glossary links. @takluyver If you want to have a quick check through anything to make sure it's all OK I'll wait until tomorrow (Tuesday) before merging.