Merge branch 'kill_list' of https://github.com/rmhayter/dojo_rules into kill_list