Fixed up a lot of comments; deleted commented out code; deleted unused imports
refactored RulesCombiner because spelling.
Merge branch 'team1-dev' of github.com:cmdunkers/wpi-suite-tng into team1-dev