Merged the files of dibbital/twig with evaughn/twig