Merge the Twig Bundle into the PHP bundle.

Merged twig bundle into PHP bundle. Closes #639.