use our kaminari; ignore gemfile lock
Merge branch 'ratjens' into current