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
add an empty page to simplates who only have 2 pages

My editor's syntax highlighting doesn't handle 2-page simplates correctly.
add missing import
add a regression test
fix another missing import
Merge pull request #2670 from gittip/simplates-3-pages

Add an empty page to simplates who only have 2 pages
Merge pull request #2671 from gittip/fix-missing-import

Fix missing import
Merge branch 'i18n+' of github.com:gittip/www.gittip.com into i18n+
Localize the tip amount in the input box and other places