NOJIRA merge new ganon-based template parser from Pawtucket2 with Providence