Merge branch 'master' into dev
The Intro to Singularity presentation pulls this in as a submodule, relative paths would be much easier.
Merge branch 'dev'