#424 more fixes: insert merge supports complex filtering, merges on the contributions table is tightly filtered and tightly tested, deletion logging obeys dry run option, datetime objects are all timezone aware, and useless DATABASE setting removed