check for plugin existence before setting options, mappings, etc
Better handling of neocomplete closing.
fixed #547. Better end of word handling.
Merge pull request #624 from nmacinnis/feature-check_for_plugins
Closing #500. xptemplate support for scala.
Merge branch '3.0' of github.com:spf13/spf13-vim into 3.0
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