Merge filter feature into master (!33) · Merge requests · discord_feedbot / discord_feedbot · GitLab

Eric Eisenhart requested to merge feature/filter into master Sep 26, 2016

Pulling changes from @4yn (https://github.com/4yn) in, along with my own changes...