Move beyondwords/vim-twig into PHP bundle.
Remove twig from default bundles.
Merge pull request #642 from webmaven/patch-1
Adding Toml support
Adding tpope/commentary
Merge branch '3.0' of github.com:spf13/spf13-vim into 3.0
Removing csapprox ... and there was rejoicing in the terminals
Fixed conflict with upstream by removing godlygeek/csapprox