all rspec and cucumber tests passing. Fixes pagination to use new kaminari api; Safely includes previous search in show view params