Don't remap <CR> for omnicomplete it causes issues

fixes issue #280
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
Improve the readme showing an option to configure the
enviroment variables because they are not set by default by
gVim.
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
improve rust and puppet support
Improve the readme to show an option to configure the
environment variables because they are not set by
default with gVim.
Bugfix #320. vimdiff "]c" jump to next diff doesn\'t work #320. Thanks the help from @keelerm84 and @pwolfram
Merge remote-tracking branch 'spf13/3.0'
Merge pull request #636 from chrisnicola/dont-remap-cr

Don't remap <CR> for omnicomplete it causes issues
Merge pull request #657 from yssource/3.0

Bugfix #320. vimdiff "]c" jump to next diff doesn't work
Merge pull request #654 from gmunumel/3.0

Improve the readme to show an option to configure the
Merge pull request #651 from globin/rust_puppet

improve rust and puppet support
Merge pull request #649 from gmunumel/improve_readme

Option to configure environment variable