Revert "Merge branch 'otago2014-05' of https://github.com/nesi/training into otago2014-05"

This reverts commit 0b4d50e7d63da2958203588345ebb6f606c94015, reversing
changes made to 836929468d9d457549b7e3742af5946ae64046d5.