Merge pull request #59 from bobolinks-2014/controller-spec

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

Testing for multiple query types
updated user model spec
added user preference model spec
Merge pull request #62 from bobolinks-2014/model-spec

model specs
updated rspec syntax