Committing a bunch of half-done things so I can work on it from the laptop tomorrow.
Merge branch 'master' of https://github.com/juturnas/glo-rs