Merge branch 'avoid-long-lines' of https://github.com/r-gaia-cs/swc-lesson-template into r-gaia-cs-avoid-long-lines

Manually merged to bring into line with latest version of codebase.