merge Eli's sideboard branch into master

uber2.0 WIP

a few things are still borked after this merge, need to fix some stuff.
todo: I need to add --force-init back here.  I removed it for the sake of making the merge easier and just used Eli's new version