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
Merge branch '3.0' of https://github.com/spf13/spf13-vim into 3.0
Move beyondwords/vim-twig into PHP bundle.
Remove twig from default bundles.
Merge pull request #642 from webmaven/patch-1
Merge branch '3.0' of https://github.com/spf13/spf13-vim into 3.0