Merge branch 'presentation-slides'
authorNeil Smith <neil.git@njae.me.uk>
Sun, 27 Mar 2016 12:40:40 +0000 (13:40 +0100)
committerNeil Smith <neil.git@njae.me.uk>
Sun, 27 Mar 2016 12:40:40 +0000 (13:40 +0100)

Trivial merge