Various cleanups and renamings, part 1.
Merge branch 'test' of https://github.com/urbit/urbit into test

ssary,