do INSERTs after UPDATEs so the strongest locks are acquired first
rename table
Merge pull request #2662 from gittip/fix-payday-deadlock

Try to fix the payday deadlock