Yeah, it looks like it probably works. I'll merge and test it out, probably tomorrow.

FWIW, you can use `make update` to replace your current Sandstorm installation with a newly-built one, or `make install` if you've never installed the bundle in the first place, and then test end-to-end.