Patch 1

Merged twig bundle into PHP bundle. Closes #639.