Don't conceal JSON syntax

Because hiding characters is a terrible idea. I can't believe the JSON plugin actually does this by default but it does. This is apparently the proper way to disable it. Fixes #375.
Merge pull request #637 from chrisnicola/patch-3

Don't conceal JSON syntax by default
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
Merge commit 'c11055ed29f81f1a232c8c6abcdafdab7209cedf' into 3.0

Conflicts:
	.vimrc.bundles