This is supposed to be mostly simple cleanups and renames, but I managed to also import some brokenness from account_cards.  That may be a good thing as the problem was harder to narrow down over there.
fix notifications helper (cucs)
merge develop to ss2
Merge branch 'devpatch' into ss2
Merge branch 'devpatch' into ss2
Disecting ss2 to find the slowness origin, chunk one
Merge ss1 forward for some missing changes
Fix merge and clean up a big of logging
more bisecting and disecting
merge ss1 again
sync
Found slowness, missing id write to cache
merge slowness fix forward
Add id cache write change, left out in automatic merge (no conflict either)
...
restored user caching
fixed joe_user stuff in integration test
wiped old assets away
re-precompiled assets
merged ss2 with latest in develop