More template tweaks.
Merge branch 'master' of github.com:urbit/urbit