fix merge code to work with new database names
update merge to capture sql errors but to keep going with the merge
just use updated_at so we don't reference EventAttendee
for some reason we need :: to designate a top-level scope
limit person search to 20
Merge branch 'staging'