fixing searches_controller tests
Merge branch 'master' into refactoring
feeds_controller_spec now works, yay
minor refactoring
Merge branch 'master' into refactoring