Changes post-lsi course, Dec 2015

Don't know why I'm only now getting around to pushing these changes. I think that these are small fixes & improvements based on our teaching the intermediate course in December last year, but the Git Fundamentals course was run since. I hope that they will still merge without much bother...