Tidy up
Merge branch 'master' of dvgit:devopsbrett/spawncamping-octo-tyrion