Merge remote-tracking branch 'upstream/3.0' into spf13-merge

* upstream/3.0: (22 commits)
  Bugfix spf13#320. vimdiff "]c" jump to next diff doesn\'t work spf13#320. Thanks the help from @keelerm84 and @pwolfram
  Improve the readme to show an option to configure the environment variables because they are not set by default with gVim.
  improve rust and puppet support
  Removing csapprox ... and there was rejoicing in the terminals
  Adding tpope/commentary
  Adding Toml support
  Improve the readme showing an option to configure the enviroment variables because they are not set by default by gVim.
  Remove twig from default bundles.
  Move beyondwords/vim-twig into PHP bundle.
  Don't conceal JSON syntax
  Don't remap <CR> for omnicomplete it causes issues
  Closing spf13#500. xptemplate support for scala.
  fixed spf13#547. Better end of word handling.
  Better handling of neocomplete closing.
  Some improvements to clipboard support
  Adding wildfire support.. Hit return to use it.
  Add tpope/vim-repeat to default install
  Fixed spf13#617. period is now an end of word designator
  fixed spf13#474 . Smaller default font on gvim
  remove spf13-vim 3.0 note
  ...