WIP: Maki

I'm using BitFaucet as a test for implementation of martindale/maki#23.  These are the included changes so far.