Switched tool rules from recursive to using antlr lists
Merge branch 'master' of https://github.com/SlackUnfairguy/tool