merge Eli's sideboard branch into master

uber2.0 WIP

a few things are still borked after this merge, need to fix some stuff.
Eli, did you remove the email category stuff, or is this a merge issue?  I suspect merge issue