1016466 nix funfactory

This removes funfactory by copying some/most/many of the bits we used into Fjord, nixing some backwards compatible stuff we didn't use, cleaning it up a smidge, sauteing it in a white wine sauce and then tweaking it until it seemed to work for the things I was testing.

r?
This green section was copied verbatim from funfactory.