Replace Pledgie with Gittip [ci skip]
Replace buftok due to incorrect delimiter handling