Merge pull request #125 from marketboomer/richard

Add union_scope as an ActiveRecord extension.
"Show more" changes - get rid of old events and re initiate them for edit boxes
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
fix weird count bug when calculatiung sweet ux size
Merge branch 'current' into ratjens
add per page
Merge pull request #127 from marketboomer/current_nadia

"Show more" changes - get rid of old events and re initiate them for edit boxes
Merge branch 'current' into ratjens

Conflicts:
	app/controllers/concerns/nunchaku/paginated.rb
Merge pull request #128 from marketboomer/ratjens

fix weird count bug when calculatiung sweet ux size
Refinement to ActiveRelation count estimate.