Made the whole thing more modular.
Merge branch 'master' of https://github.com/orithena/sportswarnbot
Repairing a botched merge.