Merge branch 'deadly_skills' of github.com:paclough/dojo_rules into deadly_skills