Redefined pfix, sfix in terms of comb, cleaned some variable names.
Merge branch 'master' of github.com:urbit/urbit