Testing for multiple query types
Fixed merge conflicts
Merge pull request #60 from bobolinks-2014/search_controller_spec

Testing for multiple query types