Update gems, fix kaminari and will_paginate conflict