restore missing flora commits

It looks like @mmtk might have accidentally overwritten a bunch of commits back on 3/22, reverting to a branch back from last July.  Check out https://github.com/funtoo/flora/commits/master to see what I mean.  There's a big gap in there.  From what I can tell @akiress has the latest clean fork as of 3/16.  If someone has a better way of restoring all this, I'm all ears...