Merge branch 'master' of https://github.com/bsutton/scoutmaster