Moar edits.
Various fixes and improvements.
Restructure calx.
Merge branch 'test' of https://github.com/urbit/urbit into test