Merge pull request #2660 from TheBlueMatt/gmfrefactor
Refactor fee rules to make them actually readable.