Switch to a newer version of pystache, and remove our private copy.