Move beyondwords/vim-twig into PHP bundle.
Remove twig from default bundles.
Merge pull request #642 from webmaven/patch-1
Merge remote-tracking branch 'upstream/3.0' into 3.0