use our kaminari; ignore gemfile lock
Merge branch 'ratjens' into current
use sweet ux count for "More" links in the index table footer
Merge pull request #126 from marketboomer/ratjens

use sweet ux count for "More" links in the index table footer
Merge branch 'current' of https://github.com/marketboomer/nunchaku into current_nadia

Conflicts:
	app/controllers/concerns/nunchaku/paginated.rb