some carrier cleanup
Merge branch 'master' of https://github.com/urbit/urbit