merge Eli's sideboard branch into master

uber2.0 WIP

a few things are still borked after this merge, need to fix some stuff.
I'll re-add this in sqlalchemy later if I need it.