Added reddit to the web search.  Maybe it should be it's own plugin?
Fix merge conflicts
Merge branch 'sambev-master'