FilterSettings should now modify Settings
Merge branch 'master' of https://github.com/derektom14/HackRice2014